From: charles@aurox.ch (Charles A. Roelli)
To: npostavs@users.sourceforge.net
Cc: 21262@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: Tue, 22 Aug 2017 16:02:17 +0200 [thread overview]
Message-ID: <m2wp5vpuom.fsf@aurox.ch> (raw)
In-Reply-To: <87o9r8bgkg.fsf@users.sourceforge.net> (npostavs@users.sourceforge.net)
[-- Attachment #1: Type: text/plain, Size: 1537 bytes --]
> 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.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-diff-goto-source-when-buffer-is-narrowed-Bug-212.patch --]
[-- Type: text/x-patch, Size: 5415 bytes --]
From aac6f9eb7aba0cc6b67b56a748e8ee25f755e8f5 Mon Sep 17 00:00:00 2001
From: "Charles A. Roelli" <charles@aurox.ch>
Date: Tue, 22 Aug 2017 15:57:01 +0200
Subject: [PATCH] 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.
---
lisp/vc/diff-mode.el | 92 +++++++++++++++++++++++++++-------------------------
1 file changed, 47 insertions(+), 45 deletions(-)
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index aa8d778..1d4af54 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -875,51 +875,53 @@ diff-find-file-name
(set (make-local-variable 'diff-remembered-defdir) default-directory)
(set (make-local-variable 'diff-remembered-files-alist) nil))
(save-excursion
- (unless (looking-at diff-file-header-re)
- (or (ignore-errors (diff-beginning-of-file))
- (re-search-forward diff-file-header-re nil t)))
- (let ((fs (diff-hunk-file-names old)))
- (if prefix (setq fs (mapcar (lambda (f) (concat prefix f)) fs)))
- (or
- ;; use any previously used preference
- (cdr (assoc fs diff-remembered-files-alist))
- ;; try to be clever and use previous choices as an inspiration
- (cl-dolist (rf diff-remembered-files-alist)
- (let ((newfile (diff-merge-strings (caar rf) (car fs) (cdr rf))))
- (if (and newfile (file-exists-p newfile)) (cl-return newfile))))
- ;; look for each file in turn. If none found, try again but
- ;; ignoring the first level of directory, ...
- (cl-do* ((files fs (delq nil (mapcar 'diff-filename-drop-dir files)))
- (file nil nil))
- ((or (null files)
- (setq file (cl-do* ((files files (cdr files))
- (file (car files) (car files)))
- ;; Use file-regular-p to avoid
- ;; /dev/null, directories, etc.
- ((or (null file) (file-regular-p file))
- file))))
- file))
- ;; <foo>.rej patches implicitly apply to <foo>
- (and (string-match "\\.rej\\'" (or buffer-file-name ""))
- (let ((file (substring buffer-file-name 0 (match-beginning 0))))
- (when (file-exists-p file) file)))
- ;; If we haven't found the file, maybe it's because we haven't paid
- ;; attention to the PCL-CVS hint.
- (and (not prefix)
- (boundp 'cvs-pcl-cvs-dirchange-re)
- (save-excursion
- (re-search-backward cvs-pcl-cvs-dirchange-re nil t))
- (diff-find-file-name old noprompt (match-string 1)))
- ;; if all else fails, ask the user
- (unless noprompt
- (let ((file (expand-file-name (or (car fs) ""))))
- (setq file
- (read-file-name (format "Use file %s: " file)
- (file-name-directory file) file t
- (file-name-nondirectory file)))
- (set (make-local-variable 'diff-remembered-files-alist)
- (cons (cons fs file) diff-remembered-files-alist))
- file))))))
+ (save-restriction
+ (widen)
+ (unless (looking-at diff-file-header-re)
+ (or (ignore-errors (diff-beginning-of-file))
+ (re-search-forward diff-file-header-re nil t)))
+ (let ((fs (diff-hunk-file-names old)))
+ (if prefix (setq fs (mapcar (lambda (f) (concat prefix f)) fs)))
+ (or
+ ;; use any previously used preference
+ (cdr (assoc fs diff-remembered-files-alist))
+ ;; try to be clever and use previous choices as an inspiration
+ (cl-dolist (rf diff-remembered-files-alist)
+ (let ((newfile (diff-merge-strings (caar rf) (car fs) (cdr rf))))
+ (if (and newfile (file-exists-p newfile)) (cl-return newfile))))
+ ;; look for each file in turn. If none found, try again but
+ ;; ignoring the first level of directory, ...
+ (cl-do* ((files fs (delq nil (mapcar 'diff-filename-drop-dir files)))
+ (file nil nil))
+ ((or (null files)
+ (setq file (cl-do* ((files files (cdr files))
+ (file (car files) (car files)))
+ ;; Use file-regular-p to avoid
+ ;; /dev/null, directories, etc.
+ ((or (null file) (file-regular-p file))
+ file))))
+ file))
+ ;; <foo>.rej patches implicitly apply to <foo>
+ (and (string-match "\\.rej\\'" (or buffer-file-name ""))
+ (let ((file (substring buffer-file-name 0 (match-beginning 0))))
+ (when (file-exists-p file) file)))
+ ;; If we haven't found the file, maybe it's because we haven't paid
+ ;; attention to the PCL-CVS hint.
+ (and (not prefix)
+ (boundp 'cvs-pcl-cvs-dirchange-re)
+ (save-excursion
+ (re-search-backward cvs-pcl-cvs-dirchange-re nil t))
+ (diff-find-file-name old noprompt (match-string 1)))
+ ;; if all else fails, ask the user
+ (unless noprompt
+ (let ((file (expand-file-name (or (car fs) ""))))
+ (setq file
+ (read-file-name (format "Use file %s: " file)
+ (file-name-directory file) file t
+ (file-name-nondirectory file)))
+ (set (make-local-variable 'diff-remembered-files-alist)
+ (cons (cons fs file) diff-remembered-files-alist))
+ file)))))))
(defun diff-ediff-patch ()
--
2.9.4
next prev parent reply other threads:[~2017-08-22 14:02 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 [this message]
2017-08-27 12:21 ` Charles A. Roelli
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=m2wp5vpuom.fsf@aurox.ch \
--to=charles@aurox.ch \
--cc=21262@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.