From: Tom Tromey <tromey@redhat.com>
To: emacs-devel@gnu.org
Subject: patch for smerge buglet
Date: Sun, 04 May 2008 18:08:51 -0600 [thread overview]
Message-ID: <m3hcddmx2k.fsf@fleche.redhat.com> (raw)
In a vc-dir buffer I used "f" to open a ChangeLog file that had a
conflict. As often happens with ChangeLog, the conflict was on the
very first line of the file. To my surprise, the file was visited
with point at EOF.
This patch to smerge-mode fixed the problem for me.
Tom
2008-05-05 Tom Tromey <tromey@redhat.com>
* smerge-mode.el (smerge-start-session): Don't call smerge-next if
looking at conflict marker.
*** smerge-mode.el.~1.66.~ 2008-04-17 13:32:08.000000000 -0600
--- smerge-mode.el 2008-05-04 18:06:19.000000000 -0600
***************
*** 1227,1233 ****
If no conflict maker is found, turn off `smerge-mode'."
(smerge-mode 1)
(condition-case nil
! (smerge-next)
(error (smerge-auto-leave))))
(provide 'smerge-mode)
--- 1227,1234 ----
If no conflict maker is found, turn off `smerge-mode'."
(smerge-mode 1)
(condition-case nil
! (unless (looking-at smerge-begin-re)
! (smerge-next))
(error (smerge-auto-leave))))
(provide 'smerge-mode)
next reply other threads:[~2008-05-05 0:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-05 0:08 Tom Tromey [this message]
2008-05-05 6:16 ` patch for smerge buglet Stefan Monnier
2008-05-05 11:11 ` David Kastrup
2008-05-05 18:04 ` 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=m3hcddmx2k.fsf@fleche.redhat.com \
--to=tromey@redhat.com \
--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).