unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
* bug#73544: smerge key bindings awkward
@ 2024-09-29  3:30 Daniel Colascione
  2024-09-29  5:35 ` Eli Zaretskii
                   ` (2 more replies)
  0 siblings, 3 replies; 19+ messages in thread
From: Daniel Colascione @ 2024-09-29  3:30 UTC (permalink / raw)
  To: 73544

[-- Attachment #1: Type: text/plain, Size: 275 bytes --]

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?

[-- Attachment #2: Type: text/html, Size: 338 bytes --]

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2024-10-22 14:19 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2024-10-22  5:12                         ` Eli Zaretskii
2024-10-22 14:19                           ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors

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).