patch for smerge buglet

patch for smerge buglet

[Tom Tromey]

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)

Re: patch for smerge buglet

[Stefan Monnier]

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

Thanks, installed,


        Stefan

Re: patch for smerge buglet

[David Kastrup]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> 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.
>
> Thanks, installed,

The git conflict markers are sometimes left in the file.  Do you use git
yourself, or should I send an example when this happens the next time?

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum

Re: patch for smerge buglet

[Stefan Monnier]

>>> 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.
>> 
>> Thanks, installed,

> The git conflict markers are sometimes left in the file.  Do you use git
> yourself, or should I send an example when this happens the next time?

I don't know what you mean by "left in the file" or what it has to do
with smerge-mode.  If Git does not use the standard diff3 markers, then
it would be much more valuable to change Git than to adapt smerge-mode
to it.


        Stefan