[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
patch for smerge buglet
From: |
Tom Tromey |
Subject: |
patch for smerge buglet |
Date: |
Sun, 04 May 2008 18:08:51 -0600 |
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) |
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 <address@hidden>
* 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)
- patch for smerge buglet,
Tom Tromey <=