GNU bug report logs - #73544
smerge key bindings awkward

Previous Next

Package: emacs;

Reported by: Daniel Colascione <dancol <at> dancol.org>

Date: Sun, 29 Sep 2024 03:31:02 UTC

Severity: wishlist

Done: Stefan Monnier <monnier <at> iro.umontreal.ca>

Bug is archived. No further changes may be made.

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Stefan Monnier <monnier <at> iro.umontreal.ca>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#73544: closed (smerge key bindings awkward )
Date: Tue, 22 Oct 2024 14:21:02 +0000

[Message part 1 (text/plain, inline)]
Your message dated Tue, 22 Oct 2024 10:19:47 -0400
with message-id <jwved482pao.fsf-monnier+emacs <at> gnu.org>
and subject line Re: bug#73544: smerge key bindings awkward
has caused the debbugs.gnu.org bug report #73544,
regarding smerge key bindings awkward 
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
73544: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73544
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]
From: Daniel Colascione <dancol <at> dancol.org>
To: bug-gnu-emacs <at> gnu.org
Subject: smerge key bindings awkward 
Date: Sat, 28 Sep 2024 23:30:13 -0400

[Message part 3 (text/plain, inline)]
In smerge mode, C-c ^ n goes to the next merge conflict. Having resolved all merge conflicts, smerge turns itself off. Typing C-c ^ n again now puts a stray "n" into the buffer. Is there some tweak we can make to avoid this situation? Change the default of smerge-auto-leave?
[Message part 4 (text/html, inline)]
[Message part 5 (message/rfc822, inline)]
From: Stefan Monnier <monnier <at> iro.umontreal.ca>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: 73544-done <at> debbugs.gnu.org, dmitry <at> gutov.dev,
 Andrea Corallo <acorallo <at> gnu.org>, dancol <at> dancol.org,
 Stefan Kangas <stefankangas <at> gmail.com>
Subject: Re: bug#73544: smerge key bindings awkward
Date: Tue, 22 Oct 2024 10:19:47 -0400

>> Maintainers?  Any objections?
> Not here.

Thanks, pushed to `master`.


        Stefan
This bug report was last modified 267 days ago.

Previous Next

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