From: charles@aurox.ch (Charles A. Roelli)
To: npostavs@users.sourceforge.net
Cc: 21262-done@debbugs.gnu.org, dima@secretsauce.net
Subject: bug#21262: 25.0.50; Diff-mode gets confused about its narrowing if hunk source not found
Date: Sun, 27 Aug 2017 14:21:05 +0200 [thread overview]
Message-ID: <m2tw0t9p72.fsf@aurox.ch> (raw)
In-Reply-To: <m2wp5vpuom.fsf@aurox.ch> (charles@aurox.ch)
> Date: Tue, 22 Aug 2017 16:02:17 +0200
> From: charles@aurox.ch (Charles A. Roelli)
>
> > From: npostavs@users.sourceforge.net
> > Cc: Dima Kogan <dima@secretsauce.net>, 21262@debbugs.gnu.org
> > Date: Mon, 21 Aug 2017 20:18:39 -0400
> >
> > Looks like a reasonable fix to me (though I know only a little bit of
> > diff-mode). Here it is again ignoring whitespace, which I think makes
> > it easier to see what is happening:
> >
> > modified lisp/vc/diff-mode.el
> > @@ -874,6 +874,8 @@ diff-find-file-name
> > ;; Flush diff-remembered-files-alist if the default-directory is changed.
> > (set (make-local-variable 'diff-remembered-defdir) default-directory)
> > (set (make-local-variable 'diff-remembered-files-alist) nil))
> > + (save-restriction
> > + (widen)
> > (save-excursion
> > (unless (looking-at diff-file-header-re)
> > (or (ignore-errors (diff-beginning-of-file))
> > @@ -919,7 +921,7 @@ diff-find-file-name
> > (file-name-nondirectory file)))
> > (set (make-local-variable 'diff-remembered-files-alist)
> > (cons (cons fs file) diff-remembered-files-alist))
> > - file))))))
> > + file)))))))
> >
> > Perhaps we should swap the save-restriction and save-excursion around
> > though? The elisp manual says:
> >
> > If you use both `save-restriction' and `save-excursion' together,
> > `save-excursion' should come first (on the outside). Otherwise,
> > the old point value would be restored with temporary narrowing
> > still in effect.
>
> Good point, thank you. I'll apply the attached patch in a few days if
> there's no further discussion.
I've pushed the fix, closing the bug now.
commit 208a3cb05f4d954abc9dd6c8cd858ef2bedd7cb4
Date: Tue Aug 22 15:57:01 2017 +0200
Fix 'diff-goto-source' when buffer is narrowed (Bug#21262)
* lisp/vc/diff-mode.el (diff-find-file-name): Save the current
narrowing, and widen the buffer before searching for the name of the
file corresponding to the diff.
With thanks to Noam Postavsky.
prev parent reply other threads:[~2017-08-27 12:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-15 5:12 bug#21262: 25.0.50; Diff-mode gets confused about its narrowing if hunk source not found Dima Kogan
2017-08-21 19:49 ` Charles A. Roelli
2017-08-22 0:18 ` npostavs
2017-08-22 14:02 ` Charles A. Roelli
2017-08-27 12:21 ` Charles A. Roelli [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2tw0t9p72.fsf@aurox.ch \
--to=charles@aurox.ch \
--cc=21262-done@debbugs.gnu.org \
--cc=dima@secretsauce.net \
--cc=npostavs@users.sourceforge.net \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.