Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

* lisp/vc/diff.el (diff-buffer-with-file): Support indirect buffers.

Browse source 
(Bug#32195)
This commit is contained in:
Phil Sainty 2018-07-18 19:32:11 +12:00
parent 177deaf9a1
commit 1bcf5d02da
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/vc/diff.el
View file

@ -226,8 +226,9 @@ With prefix arg, prompt for diff switches."
"View the differences between BUFFER and its associated file.
This requires the external program `diff' to be in your `exec-path'."
(interactive "bBuffer: ")
(with-current-buffer (get-buffer (or buffer (current-buffer)))
(diff buffer-file-name (current-buffer) nil 'noasync)))
(let ((buf (get-buffer (or buffer (current-buffer)))))
(with-current-buffer (or (buffer-base-buffer buf) buf)
(diff buffer-file-name (current-buffer) nil 'noasync))))
(provide 'diff)