GNU bug report logs - #73544
smerge key bindings awkward

Previous Next

Full log

View this message in rfc822 format

From: Eli Zaretskii <eliz <at> gnu.org>
To: Stefan Monnier <monnier <at> iro.umontreal.ca>, Stefan Kangas <stefankangas <at> gmail.com>, Andrea Corallo <acorallo <at> gnu.org>
Cc: 73544 <at> debbugs.gnu.org, dmitry <at> gutov.dev, dancol <at> dancol.org
Subject: bug#73544: smerge key bindings awkward
Date: Tue, 22 Oct 2024 08:12:00 +0300

> From: Stefan Monnier <monnier <at> iro.umontreal.ca>
> Cc: Eli Zaretskii <eliz <at> gnu.org>,  dmitry <at> gutov.dev,  73544 <at> debbugs.gnu.org
> Date: Mon, 21 Oct 2024 19:56:12 -0400
> 
> >>How 'bout the patch below, which will end up preventing `read-key-sequence`
> >>from stopping at `C-c ^`?
> >>
> >>
> >>        Stefan
> >>
> >>
> >>diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
> >>index aad3e302826..fa52286fee7 100644
> >>--- a/lisp/vc/smerge-mode.el
> >>+++ b/lisp/vc/smerge-mode.el
> >>@@ -168,6 +168,10 @@ smerge-command-prefix
> >> 		 (const :tag "none"  "")
> >> 		 string))
> >> 
> >>+;; Make it so `C-x ^ n' doesn't insert `n' but just signals an error
> >>+;; when SMerge mode is not enabled.
> >>+;;;###autoload (global-set-key "\C-c^" (make-sparse-keymap))
> >>+
> >> (defvar-keymap smerge-mode-map
> >>   (key-description smerge-command-prefix) smerge-basic-map)
> >
> > WFM
> 
> Maintainers?  Any objections?

Not here.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.