From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Konstantin Kharlamov 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 16:59:26 +0300 Message-ID: <9f683392348159d92a7d141b3b8774ad365334d5.camel@yandex.ru> References: <865xykr79f.fsf@gnu.org> <19beac5b9be5696e57c4d8e3759990ef9d04ae69.camel@yandex.ru> 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="39900"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Evolution 3.50.3 Cc: Eli Zaretskii , 69220@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Feb 20 15:01:13 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 1rcQgK-000A6n-CR for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 20 Feb 2024 15:01:12 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcQg3-00056S-T0; Tue, 20 Feb 2024 09:00:55 -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 1rcQfq-00054B-0N for bug-gnu-emacs@gnu.org; Tue, 20 Feb 2024 09:00:49 -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 1rcQfp-0007xj-0W for bug-gnu-emacs@gnu.org; Tue, 20 Feb 2024 09:00:41 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rcQgA-0001jo-Mo for bug-gnu-emacs@gnu.org; Tue, 20 Feb 2024 09:01:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Konstantin Kharlamov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 20 Feb 2024 14:01:02 +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.17084376246605 (code B ref 69220); Tue, 20 Feb 2024 14:01:02 +0000 Original-Received: (at 69220) by debbugs.gnu.org; 20 Feb 2024 14:00:24 +0000 Original-Received: from localhost ([127.0.0.1]:44608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcQfX-0001iT-Pr for submit@debbugs.gnu.org; Tue, 20 Feb 2024 09:00:24 -0500 Original-Received: from forward501b.mail.yandex.net ([178.154.239.145]:48746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcQfW-0001iK-2P for 69220@debbugs.gnu.org; Tue, 20 Feb 2024 09:00:23 -0500 Original-Received: from mail-nwsmtp-smtp-production-main-22.iva.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-22.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:2cad:0:640:fa29:0]) by forward501b.mail.yandex.net (Yandex) with ESMTPS id 2583360CAF; Tue, 20 Feb 2024 16:59:29 +0300 (MSK) Original-Received: by mail-nwsmtp-smtp-production-main-22.iva.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id RxRImPR3SmI0-Tz2CfaF2; Tue, 20 Feb 2024 16:59:28 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1708437568; bh=2kmkT1yjSL5ClD+H4qqyuQf78itunkSFA24M+vzHtXA=; h=References:Date:In-Reply-To:Cc:To:From:Subject:Message-ID; b=qnU2eB6FnNIdEwX55DHJIRtfDH+8Muh6BNwqni6zRjasYTgFLRy1NsfVUc4gQJRLm B0NeN0UIaTIyO1VOZU6GFgaIh81ZQu7Trct7R/bKC5N9Rn8lsgYwOFUGRyuR+I3NRl fBG5370CgvQyrDHgHu7A/x2MNY6qOw7LEMFTR9dg= Authentication-Results: mail-nwsmtp-smtp-production-main-22.iva.yp-c.yandex.net; dkim=pass header.i=@yandex.ru In-Reply-To: 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:280325 Archived-At: On Tue, 2024-02-20 at 08:53 -0500, Stefan Monnier wrote: > > > 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. >=20 > No, `C-u` `universal-argument` is a prefix command and it's the most > common *but* not the only one.=C2=A0 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. >=20 > > Aaah, I think I get it. You want a command that would iterate > > through > > conflicts and ask a user which solution side to apply? >=20 > But it asks only once. Okay, I see now. So a user calls the command, the command asks once which side to apply, and then does that automatically for all other conflicts. So=E2=80=A6 what's the difference compared to my patch, only tha= t it asks a user after going to a conflict? Or do you want it to additionally stop at each conflict and ask a user if they want to apply the "resolution"?