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#74509: Feature request - smerge-mode Date: Sat, 21 Dec 2024 21:54:00 -0500 Message-ID: References: <86bjxx817w.fsf@gnu.org> <86plll8lt0.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="36735"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Branislav =?UTF-8?Q?Zahradn=C3=ADk?= , 74509@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Dec 22 03:55:17 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 1tPC7g-0009Qx-Tz for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 22 Dec 2024 03:55:17 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tPC7U-0005At-57; Sat, 21 Dec 2024 21:55:04 -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 1tPC7T-0005Al-0E for bug-gnu-emacs@gnu.org; Sat, 21 Dec 2024 21:55:03 -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 1tPC7S-0007ea-Jm for bug-gnu-emacs@gnu.org; Sat, 21 Dec 2024 21:55:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=/H4ITLJ1BYoDeE5WkYzcY47dBUksxDMxGkUs90qiY1o=; b=FIGpacDPkzDbltY+LvdyNRlPCYM5tJLUd7x2dqJ+Vz8E+CeVTpIB/dTWEwL50d/CKqw8TanxbnQcf8wMXGcYtSOmyMDkT/7pLaW4fZxwmIa+SJvbu/Ick1+C/3+bMHfEOW1eHQjOwFkdNDfBLjiqWnGfmJi2Zr/+tCU9J4J/ME/LOha6n0ztUfZHN/xRxeUp8PhQzdptK/HfXIquuupXNUXDPKLmTP+Yicmq2etNKwd3yoOUVNwUKGzc67ecluqT4qRbie1Ai4r1Advg+igpiAQawue0hBFDy2jZrzO4/7eKUhyTFyOnHjQCyGxjIJTazYXxUD/DN7bqya4n8uGIkg==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tPC7S-0007bR-DD for bug-gnu-emacs@gnu.org; Sat, 21 Dec 2024 21:55: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: Sun, 22 Dec 2024 02:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74509 X-GNU-PR-Package: emacs Original-Received: via spool by 74509-submit@debbugs.gnu.org id=B74509.173483605329146 (code B ref 74509); Sun, 22 Dec 2024 02:55:02 +0000 Original-Received: (at 74509) by debbugs.gnu.org; 22 Dec 2024 02:54:13 +0000 Original-Received: from localhost ([127.0.0.1]:48542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tPC6e-0007a1-RY for submit@debbugs.gnu.org; Sat, 21 Dec 2024 21:54:13 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:1678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tPC6c-0007Zm-3V for 74509@debbugs.gnu.org; Sat, 21 Dec 2024 21:54:10 -0500 Original-Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 1AC53100055; Sat, 21 Dec 2024 21:54:04 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1734836043; bh=uk9Wf/yG4xO7vLgmWKVdAGZdPoK/CuYiIpUavIfQdvM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=cZ3yQD2OP0c1muorHfRoKL1H/dKQxjrtn2r9QalAK0sciDFiLUh0elqR2iDQb+vDt Yd5y8S250aIPsYALfgf8sSEwRqHv8zGl3lp1E2p+dA9FfBoUTLGUrBGX4f0+JPMiTn 2JGpzCLW9hSoS7xdGh3S3Afn1IldneT3FvduTYbe1pEqjQmo9LzjE8rtjHMQvTQTSq I/TFS7nBcDZhDc1NA7iE3IlnAUNHVTvDSvAW+mZCb2pOjogid/80kRYWz5RrQomn8z X7R+4hdyNQ2cteYSBTOSEa2E2srqeUO+YvuNEq9pE0PSID/yBSj+TrmbiiQFtFitrK KzZEhDlMjy5zQ== Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 1B71B100035; Sat, 21 Dec 2024 21:54:03 -0500 (EST) Original-Received: from asado (unknown [199.119.74.1]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 6B4E61206B4; Sat, 21 Dec 2024 21:54:02 -0500 (EST) In-Reply-To: (Stefan Monnier's message of "Sat, 21 Dec 2024 10:11:30 -0500") 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:297565 Archived-At: >> How should we go about this bug report? >> Can we make some progress here? Or should we close it as wontfix? > No, I think his commands make sense. We just need to improve them so > they also work with 3-part conflicts. I just pushed to `master` a version of `smerge-extend` which can incorporate both following and preceding lines, and works with both diff2 and diff3 style conflicts. The OP also suggested binding this new command as well as `smerge-swap` in the SMerge minor mode map (to `C-c ^ x` and `C-c ^ s` respectively). That would shadow `M-x` and `M-s` (when `smerge-mode` is active) for users who configured `smerge-command-prefix` to be ESC, so I think that could be problematic. For that reason, I did not include that part. Stefan