From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Daniel Colascione Newsgroups: gmane.emacs.bugs Subject: bug#73544: smerge key bindings awkward Date: Thu, 17 Oct 2024 14:44:06 -0400 Message-ID: <82329D44-157D-43E5-88D0-CB381F2C6AB5@dancol.org> References: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> <86wmit2xa0.fsf@gnu.org> <86msjp2tya.fsf@gnu.org> <586D4862-3603-46AE-9A8F-163BD7FB2FAA@dancol.org> <86r08ktg7w.fsf@gnu.org> <931560E0-E032-4570-A4A4-378215660C25@dancol.org> <86bjzot1z6.fsf@gnu.org> <122D1E12-D860-41AC-A1CF-18ECCA20AD60@dancol.org> 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="14433"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: K-9 Mail for Android Cc: 73544@debbugs.gnu.org, dmitry@gutov.dev, Eli Zaretskii To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Oct 17 20:48:10 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 1t1VXd-0003Uo-Q6 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 17 Oct 2024 20:48:10 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1VXE-0007G8-EZ; Thu, 17 Oct 2024 14:47:44 -0400 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 1t1VXB-0007Fe-Hd for bug-gnu-emacs@gnu.org; Thu, 17 Oct 2024 14:47:41 -0400 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 1t1VXB-000399-4O for bug-gnu-emacs@gnu.org; Thu, 17 Oct 2024 14:47:41 -0400 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=ThajHeb8QLDc9WUhIdrp/WqM4Aw1u5pk0fp+LZdKQek=; b=tEcD1S+5Qoss2B8k1D7b6UW2cJJaYLn+FjYUQ0Q7A5RgKfE3Z80RhSWXQjFa4ZJrn9nlLRISujzovTehn8iZ5ToQax0xO9xHtsYXGslKx3aRjEsgT73Pz6dGB+b8YSludHYiAm0TFpO+Snsh9IxOiOrwyuesbFZA/yrFNTxh36+fHgFoXq7l125dAvBEwebS4dTUhYqWIDKdb7E6avocle90DdL9UQ+UBQ4frK6oI5cubiXaHtSkNPDpHbSBdXmqFBBpuR8tL0/CFZH+fbTP2R2bga/oJ5o5ardPeyC6KVVsjSz3BgFZSfKlhA0s2ObdPXAuweNyPptQSoNmUh/tow==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t1VXW-0006Qg-AU for bug-gnu-emacs@gnu.org; Thu, 17 Oct 2024 14:48:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Daniel Colascione Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 17 Oct 2024 18:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73544 X-GNU-PR-Package: emacs Original-Received: via spool by 73544-submit@debbugs.gnu.org id=B73544.172919082424603 (code B ref 73544); Thu, 17 Oct 2024 18:48:02 +0000 Original-Received: (at 73544) by debbugs.gnu.org; 17 Oct 2024 18:47:04 +0000 Original-Received: from localhost ([127.0.0.1]:35616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1VWU-0006OJ-Pr for submit@debbugs.gnu.org; Thu, 17 Oct 2024 14:47:03 -0400 Original-Received: from dancol.org ([96.126.100.184]:48272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1VWO-0006O5-Eu for 73544@debbugs.gnu.org; Thu, 17 Oct 2024 14:46:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=dancol.org; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID: References:In-Reply-To:Subject:CC:To:From:Date:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=ThajHeb8QLDc9WUhIdrp/WqM4Aw1u5pk0fp+LZdKQek=; b=o69taF9DVgLE0jKHZSOO/AUNDH EliU1KqO53Fl+Q+tCA7AIalx8BPQvkhSoTeZ9nc3dYBvh72QiM06dZS/qvNcHfHjsfKslOE5Cnt3y kY+QONrrkC4oH9Gfp9xNTbGXfge2wV8Jn8XpEKpR0Iy2otfbNrXE8ALd61recFovWb1PdULsQPdrZ D25ulDZ0fptqch7jpsLOK0n6rwcOWPFOuMdVgoHCD26XdwVrTYFCxheD/qZ9f6OVjCiatk+eK+afn TeB4PGCNNeDt7JroFA5JvE6i07LHeOh41OoehCtpqe0i0K6a1iNak4WIqtPXbYroQOd1IZKTcHGt3 l5e3gD6g==; Original-Received: from [2600:1006:b11e:df13:0:4e:11eb:c01] (port=58320 helo=[IPv6:::1]) by dancol.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.96) (envelope-from ) id 1t1VTi-0007su-0B; Thu, 17 Oct 2024 14:44:07 -0400 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:293747 Archived-At: On October 17, 2024 1:37:43 PM EDT, Stefan Monnier wrote: >> It's a defect in the user interface=2E > >IIUC the original scenario is: > > C-c ^ n > > C-c ^ n > >and here being annoyed that `n` was inserted (after flashing the buffer >because `C-c ^` is not bound to anything) because that was the last >conflict and `smerge-mode` turned itself off automatically=2E > >I'm not completely sure what is the exact defect you see here and how >you suggest to fix it=2E E=2Eg=2E do you also care to "fix" a case like > > emacs foo > C-c ^ n > >where the user forgot to enable `smerge-mode`? > >How 'bout the patch below, which will end up preventing `read-key-sequenc= e` >from stopping at `C-c ^`? > > > Stefan > > >diff --git a/lisp/vc/smerge-mode=2Eel b/lisp/vc/smerge-mode=2Eel >index aad3e302826=2E=2Efa52286fee7 100644 >--- a/lisp/vc/smerge-mode=2Eel >+++ b/lisp/vc/smerge-mode=2Eel >@@ -168,6 +168,10 @@ smerge-command-prefix > (const :tag "none" "") > string)) >=20 >+;; Make it so `C-x ^ n' doesn't insert `n' but just signals an error >+;; when SMerge mode is not enabled=2E >+;;;###autoload (global-set-key "\C-c^" (make-sparse-keymap)) >+ > (defvar-keymap smerge-mode-map > (key-description smerge-command-prefix) smerge-basic-map) >=20 > WFM