From: Matthew Bauer <mjbauer95@gmail.com>
To: emacs-devel@gnu.org
Subject: Fwd: [PATCH] Don’t run smerge multiple times
Date: Tue, 17 Mar 2020 20:07:25 -0400 [thread overview]
Message-ID: <CAFnZKr1wh3gio5aHiwar=J9CnvS63GJ7ps0cmE2hdwSUyMYXTg@mail.gmail.com> (raw)
In-Reply-To: <CAFnZKr0Fij5A_Th0=LU=9-nAbFJ=8XHD9dduDmFBFZCTOJY_DA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 999 bytes --]
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.
[-- Attachment #2: Type: text/html, Size: 1434 bytes --]
next prev parent reply other threads:[~2020-03-18 0:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-11 18:55 [PATCH] Don’t run smerge multiple times Matthew Bauer
2020-02-13 16:17 ` Stefan Monnier
[not found] ` <CAFnZKr0Fij5A_Th0=LU=9-nAbFJ=8XHD9dduDmFBFZCTOJY_DA@mail.gmail.com>
2020-03-18 0:07 ` Matthew Bauer [this message]
2020-03-18 14:20 ` Fwd: " Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFnZKr1wh3gio5aHiwar=J9CnvS63GJ7ps0cmE2hdwSUyMYXTg@mail.gmail.com' \
--to=mjbauer95@gmail.com \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).