From: Daniel Colascione <dancol@dancol.org>
To: Emacs developers <emacs-devel@gnu.org>
Subject: smerge-mode is fantastic, but it annoys me
Date: Mon, 02 Mar 2015 17:47:42 -0800 [thread overview]
Message-ID: <54F512BE.5090705@dancol.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
smerge-mode is handy for resolving conflicts, but it's annoying that
after resolving them all, smerge turns itself off, and C-c ^ n starts
inserting stray "n" characters in the buffer. Can we just leave smerge
on after resolving conflicts?
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-03-03 1:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-03 1:47 Daniel Colascione [this message]
2015-03-03 12:49 ` smerge-mode is fantastic, but it annoys me Nicolas Richard
2015-03-03 16:43 ` Stefan Monnier
2015-03-04 12:43 ` Nicolas Richard
2015-03-04 12:56 ` Ivan Shmakov
2015-03-04 14:15 ` Nicolas Richard
2015-03-04 16:33 ` John Yates
2015-03-06 4:24 ` Nicolas Richard
2015-03-03 14:53 ` Barry Warsaw
2015-03-03 18:10 ` Stefan Monnier
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=54F512BE.5090705@dancol.org \
--to=dancol@dancol.org \
--cc=emacs-devel@gnu.org \
/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).