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: Mon, 19 Feb 2024 22:15:36 -0500 Message-ID: References: <865xykr79f.fsf@gnu.org> Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18860"; 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 04:17:01 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 1rcGcu-0004hZ-69 for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 20 Feb 2024 04:17:00 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcGcd-0004k6-3p; Mon, 19 Feb 2024 22:16:43 -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 1rcGcb-0004jt-5Z for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 22:16:41 -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 1rcGca-0003oT-TY for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 22:16:40 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rcGcw-0006Sm-AR for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2024 22:17:02 -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 03:17: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.170839897224766 (code B ref 69220); Tue, 20 Feb 2024 03:17:02 +0000 Original-Received: (at 69220) by debbugs.gnu.org; 20 Feb 2024 03:16:12 +0000 Original-Received: from localhost ([127.0.0.1]:44019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcGc7-0006RO-Da for submit@debbugs.gnu.org; Mon, 19 Feb 2024 22:16:11 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:62629) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcGc2-0006Qf-EB for 69220@debbugs.gnu.org; Mon, 19 Feb 2024 22:16:09 -0500 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 11A218090D; Mon, 19 Feb 2024 22:15:39 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1708398937; bh=LmO2npe8bK6JUU7SL6KhT5inu7Ruz3RO4gHNGUqWJHU=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=BCHCRtr+ZrJF+1IETti8rJCSfRzb6fFeLSwv2/Ema5HhsWrcKrAd9hCqIwtEdvoDH EVuJf+p+ES1C77fa3jUjrui1NOkBWovhMJ69icbDhSr5hl9Zyr4mNpyR+luy/cmuFH xjKeKDlBUMQ9zirE/r3NaeBSR9bSfNmoNY4+r1gwrbyDVFAlWAIL4R7BmUGzDbXaJO vIeosOoylj5V62kM/5+sTqtgsGLzGbcG9jqYnoJzA0pmQdf4nc94BtrjCtiaccA6xg 4a17V4QdQffY1SwWcc2CiF9dqtjJhep4MnLKgeILzyraCZhnLlrjFtcRTQnTrQWqdo 758+zdLBsWP9g== Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id B16A3807A5; Mon, 19 Feb 2024 22:15:37 -0500 (EST) Original-Received: from pastel (unknown [45.72.205.238]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 87248120434; Mon, 19 Feb 2024 22:15:37 -0500 (EST) In-Reply-To: (Konstantin Kharlamov's message of "Tue, 20 Feb 2024 06:02:30 +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:280305 Archived-At: >> No: `smerge-apply-all-conflicts` would *be* the prefix command. >> Instead of a prefix `C-u 8` which causes the next command to be >> executed 8 times, your use `M-x smerge-apply-all-conflicts` to cause >> the next command to be applied to every conflict in the buffer. [...] > I think I see, so you suggest a function that would apply resolution to > the next N conflicts. No, that's not what I'm suggesting. If you re-read the above I say "applied to every conflict in the buffer" (rather than some specific N), and I don't say "resolve" or anything like "resolution". It's really doing the same as your patch, except that the command to apply at each iteration is not limited to one of `smerge-keep-(upper/base/lower)` (and that it's specified by hitting the command's key binding rather than by choosing a string in the minibuffer). BTW, your use of [upper base lower] as a completion table is both cute and horrible at the same time :-) Stefan