Fwd: [PATCH] Don’t run smerge multiple times

[Matthew Bauer]

Sorry for the late reply - just started going through forgotten emails.

>> autorevert ends up calling vc-git-find-file-hook multiple times.

> This sounds like a problem in itself.
> Or is it really because the file gets modified multiple times?

I think it is caused by each edit. At least the symptom is that after so much idle time,

vc-git-find-file-hook gets run. Now that I'm looking for it, I don't actually see

vc-git-find-file-hook is added to any hooks, so something seems off. It may be some

kind of interaction with Magit that sets this up.

> Tho now that I think about it, going to the next hunk sounds like a bad
> idea when in the middle of an edit reagrdless of you were already in
> smerge-mode.

>> Related to
>> https://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02201.html

> That patch was never installed.  Has that problem been
> fixed/circumvented some other way?

It looks like it was fixed in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559 in a different way.