From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: Daniel Colascione <dancol@dancol.org>
Cc: 73544@debbugs.gnu.org, dmitry@gutov.dev, Eli Zaretskii <eliz@gnu.org>
Subject: bug#73544: smerge key bindings awkward
Date: Mon, 21 Oct 2024 19:56:12 -0400 [thread overview]
Message-ID: <jwvmsix3tag.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <82329D44-157D-43E5-88D0-CB381F2C6AB5@dancol.org> (Daniel Colascione's message of "Thu, 17 Oct 2024 14:44:06 -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?
Stefan
prev parent reply other threads:[~2024-10-21 23:56 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-29 3:30 bug#73544: smerge key bindings awkward Daniel Colascione
2024-09-29 5:35 ` Eli Zaretskii
2024-09-30 12:39 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-09-29 23:27 ` Sean Whitton
2024-09-30 0:33 ` Dmitry Gutov
2024-09-30 4:41 ` Daniel Colascione
2024-09-30 11:31 ` Eli Zaretskii
2024-09-30 12:28 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
[not found] ` <86msjp2tya.fsf@gnu.org>
2024-09-30 14:50 ` Daniel Colascione
2024-10-13 11:06 ` Eli Zaretskii
2024-10-13 16:01 ` Daniel Colascione
2024-10-13 16:13 ` Eli Zaretskii
2024-10-13 16:57 ` Daniel Colascione
2024-10-13 18:58 ` Eli Zaretskii
2024-10-17 17:37 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-10-17 18:44 ` Daniel Colascione
2024-10-21 23:56 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvmsix3tag.fsf-monnier+emacs@gnu.org \
--to=bug-gnu-emacs@gnu.org \
--cc=73544@debbugs.gnu.org \
--cc=dancol@dancol.org \
--cc=dmitry@gutov.dev \
--cc=eliz@gnu.org \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).