From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Matthew Bauer <mjbauer95@gmail.com>
Cc: emacs-devel@gnu.org
Subject: Re: [PATCH] Don’t run smerge multiple times
Date: Thu, 13 Feb 2020 11:17:32 -0500 [thread overview]
Message-ID: <jwvv9oapj0i.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <CAFnZKr0azTk9_wE4V=8Nvthz4rHJ+Bwx4--T2u961RXCOHwKkg@mail.gmail.com> (Matthew Bauer's message of "Tue, 11 Feb 2020 13:55:48 -0500")
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
next prev parent reply other threads:[~2020-02-13 16:17 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 [this message]
[not found] ` <CAFnZKr0Fij5A_Th0=LU=9-nAbFJ=8XHD9dduDmFBFZCTOJY_DA@mail.gmail.com>
2020-03-18 0:07 ` Fwd: " Matthew Bauer
2020-03-18 14:20 ` 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=jwvv9oapj0i.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=mjbauer95@gmail.com \
/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).