Re: make smerge-mode move the point?

[Stefan Monnier]

>> OTOH when smerge-mode gets enabled in response to a VC action, it
>> probably makes sense to move point, indeed.  So I suggest to add a new
>> command that activates smerge-mode and moves to the first conflict 

> Like this?

> ;;;###autoload
> (defun smerge-auto ()
>   "Turn on `smerge-mode' and move point to first conflict marker.
> If no conflict maker is found, turn off `smerge-mode'."
>   (smerge-mode 1)
>   (condition-case nil
>       (smerge-next)
>     (error (smerge-auto-leave))))

Looks OK.

>> (and probably run a hook where the user can place things like
>> smerge-resolve-all).

> Not sure what you mean here. Is this for something like
> vc-svn-resolve-when-done, or something else?

No, as the docstring of smerge-resolve-all explains: "Perform automatic
resolution on all conflicts".


        Stefan