From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#74509: Feature request - smerge-mode Date: Sat, 04 Jan 2025 13:43:18 +0200 Message-ID: <86ikquere1.fsf@gnu.org> References: <86bjxx817w.fsf@gnu.org> <86plll8lt0.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28153"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 74509@debbugs.gnu.org, monnier@iro.umontreal.ca To: Branislav =?UTF-8?Q?Zahradn=C3=ADk?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jan 04 12:44:21 2025 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 1tU2Zo-0007BF-5h for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 04 Jan 2025 12:44:20 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tU2ZY-0001az-3X; Sat, 04 Jan 2025 06:44: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 1tU2ZW-0001aj-9d for bug-gnu-emacs@gnu.org; Sat, 04 Jan 2025 06:44:02 -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 1tU2ZW-0004rt-1K for bug-gnu-emacs@gnu.org; Sat, 04 Jan 2025 06:44: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:References:In-Reply-To:From:Date:To:Subject; bh=cgvjqeBjQKLzbHq5W9Jiy8H4QpRAqFrexTd/nMjxctw=; b=GtGByJHp+69vVK9jt5cRh5RNTX8YilPQG6Gn0Dn37CFu/png4t/xjIIY9bPC9bcE7GPeDf/lpy2UBj+xh/6EUozEH5Y9lH6rw+7Gtp9X6GZv/S+uAlUPQCRf7tzcKpiBB1SNUkbrwEob2zNQH8TLpWwdr55sgMIGMB3s38s0EgQA3jqnPKAnNltNWYjbttQs4HyjTGBjLjmKZA5Y+N7XLLkU+VycQL5o/nQJW/6nYPocEz4edyVKOvT8Zm7mXcIIkG005EmNPXY6gwrwjW26rRVhumw2xxgTcMx4OAbS5/uFp1nARFP9wH6d8QeYL+C1OdMd+IOSv+1vFjVbcdnASg==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tU2ZV-0003BP-Rp for bug-gnu-emacs@gnu.org; Sat, 04 Jan 2025 06:44:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 04 Jan 2025 11:44:01 +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.173599100812182 (code B ref 74509); Sat, 04 Jan 2025 11:44:01 +0000 Original-Received: (at 74509) by debbugs.gnu.org; 4 Jan 2025 11:43:28 +0000 Original-Received: from localhost ([127.0.0.1]:53665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tU2Yy-0003AP-7K for submit@debbugs.gnu.org; Sat, 04 Jan 2025 06:43:28 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51024) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tU2Yw-0003AC-6S for 74509@debbugs.gnu.org; Sat, 04 Jan 2025 06:43:26 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tU2Yq-0004pd-Ts; Sat, 04 Jan 2025 06:43:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=cgvjqeBjQKLzbHq5W9Jiy8H4QpRAqFrexTd/nMjxctw=; b=qmILG3X1KCT0J3QoxIMc KuL5dVyyGD713EpM0oH4NB4+dD58jHAH5vGlLbfYtBo0ywOA0yztHPek8TH3V5ow5zvOfWsExMRtE XIUmp0xWgxwo56LdeMy/HsTnYTMQ+rgYVMFXe07//p1J2qI7BpSfn0GGIPoSU/4nqAZJr1Yiuoq6/ 3NzTnANBD2tN9KUZCaGj2wtFakyYWGxhT2T7YoXIYGBXJHGLECewC+1XbastJyT1ZiNRpl205pcIR EMib1CzTov0Ld+ujjyKEDo6QaiVmbnW+p9bo97kkMJT6ajMh8rMEj3dXH0FaTX0RoaZJHqhihIc30 hh+txM1rohA/SA==; In-Reply-To: (message from Branislav =?UTF-8?Q?Zahradn=C3=ADk?= on Sun, 22 Dec 2024 10:46:17 +0100) 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:298372 Archived-At: > From: Branislav Zahradník > Date: Sun, 22 Dec 2024 10:46:17 +0100 > Cc: Eli Zaretskii , 74509@debbugs.gnu.org > > On Sun, 22 Dec 2024 at 03:54, Stefan Monnier wrote: > > >> 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. > > Thank you very much. Such code is at the moment beyond my elisp capabilities :-) > > Key bindings were "nice to have", it's not a problem to configure it manually. > With current implementation I'd probably have two bindings anyway. > > I will think about bindings and will come with suggestion later (if/when I will have something usable) Should we close this bug or should we leave it open?