andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid infloop in which-function-mode when a vc file has changed

Browse source 
* lisp/vc/diff-mode.el (diff-find-source-location): Avoid warnings
when called from which-function-mode and the file has changed
(bug#42818).
This commit is contained in:
Lars Ingebrigtsen 2020-10-17 10:29:15 +02:00
parent 6d0b2a60f6
commit 0a3d584ce4
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/vc/diff-mode.el
View file

@ -1860,7 +1860,10 @@ SWITCHED is non-nil if the patch is already applied."
(buf (if revision
(let ((vc-find-revision-no-save t))
(vc-find-revision (expand-file-name file) revision diff-vc-backend))
(find-file-noselect file))))
;; NOPROMPT is only non-nil when called from
;; `which-function-mode', so avoid "File x changed
;; on disk. Reread from disk?" warnings.
(find-file-noselect file noprompt))))
;; Update the user preference if he so wished.
(when (> (prefix-numeric-value other-file) 8)
(setq diff-jump-to-old-file other))