From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file Date: Tue, 20 Feb 2024 08:53:48 -0500 Message-ID: References: <865xykr79f.fsf@gnu.org> <19beac5b9be5696e57c4d8e3759990ef9d04ae69.camel@yandex.ru> Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5190"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Eli Zaretskii , 69220@debbugs.gnu.org To: Konstantin Kharlamov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Feb 20 14:55:03 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rcQaM-00010r-U1 for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 20 Feb 2024 14:55:03 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcQa5-00044N-UV; Tue, 20 Feb 2024 08:54:46 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcQa0-000444-LL for bug-gnu-emacs@gnu.org; Tue, 20 Feb 2024 08:54:40 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rcQa0-0006kZ-6r for bug-gnu-emacs@gnu.org; Tue, 20 Feb 2024 08:54:40 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rcQaL-0001ZX-Sp for bug-gnu-emacs@gnu.org; Tue, 20 Feb 2024 08:55:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 20 Feb 2024 13:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69220 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 69220-submit@debbugs.gnu.org id=B69220.17084372655993 (code B ref 69220); Tue, 20 Feb 2024 13:55:01 +0000 Original-Received: (at 69220) by debbugs.gnu.org; 20 Feb 2024 13:54:25 +0000 Original-Received: from localhost ([127.0.0.1]:44599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcQZl-0001Yb-Dl for submit@debbugs.gnu.org; Tue, 20 Feb 2024 08:54:25 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:25985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcQZg-0001YI-Dg for 69220@debbugs.gnu.org; Tue, 20 Feb 2024 08:54:24 -0500 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id A08D98090D; Tue, 20 Feb 2024 08:53:51 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1708437230; bh=IGTxbHwBvAbY4PcyyYoHQ/2RF0MuwVJ+POQj/JZl1QM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=XsngoiH2uZYhHJMEMI0A1bVZjyDD6Ts/6z0VNED/I5q1yk0lTul2SNYKcKzqbm1Su 83H4PrUd8EYuRFOlmxAHJxgQzU7A4MADys8i6EFBvaUaxEUmuPWUH3OmHr0W9WHgac +bM7IslezOmUZgwNdaWAnQVYIDcnxLgiZ+BbXWniXv7rzFWYK1pq4YFY6ELODteBsZ M0xL4wmP9rZzw3rABGKrjQQ4C6hedbntF2a3ZFo8a17BUwNO/YdhiM3zigr/Cfeh40 v1FZ1vw8jy1ual/z0VtfN5tCPc03nxubjrH3JdUVX8VCcjKhw9PQC3RKw48rwfEV79 1mVYdTm6Z4njg== Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 8906580813; Tue, 20 Feb 2024 08:53:50 -0500 (EST) Original-Received: from pastel (unknown [45.72.205.238]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 6329912020C; Tue, 20 Feb 2024 08:53:50 -0500 (EST) In-Reply-To: <19beac5b9be5696e57c4d8e3759990ef9d04ae69.camel@yandex.ru> (Konstantin Kharlamov's message of "Tue, 20 Feb 2024 06:40:01 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:280323 Archived-At: >> Sorry, I'm not following =F0=9F=98=85 The closest thing I see is you want >> a prefix to each of smerge-keep-(upper/base/lower) commands to be >> added, so that pressing a `C-u 0 smerge-keep-upper` would call the >> command for each conflict in the buffer. But that seems both less >> discoverable and more code to implement. But maybe I understood >> you wrong. No, `C-u` `universal-argument` is a prefix command and it's the most common *but* not the only one. There's also `C-x RET c` (`universal-coding-system-argument`), for instance, or `C-x 4 4` (`other-window-prefix`) and `C-x 5 5` (`other-frame-prefix`). I'm suggesting we define a new such prefix command. > Aaah, I think I get it. You want a command that would iterate through > conflicts and ask a user which solution side to apply? But it asks only once. Stefan