[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] Don’t run smerge multiple times
|
From: |
Stefan Monnier |
|
Subject: |
Re: [PATCH] Don’t run smerge multiple times |
|
Date: |
Thu, 13 Feb 2020 11:17:32 -0500 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) |
Hi Matthew,
> 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?
> When this happens, smerge restarts and goes to the next hunk. This is
> not desired when in the middle of an edit.
Indeed.
> To fix, don’t start smerge when smerge is already enabled.
That sounds good.
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?
Stefan