diff options
| author | Phil Sainty <psainty@orcon.net.nz> | 2018-07-18 19:32:11 +1200 |
|---|---|---|
| committer | Phil Sainty <psainty@orcon.net.nz> | 2018-07-29 00:30:01 +1200 |
| commit | 1bcf5d02da96784a04034b4c0aba8fdfa1413c4e (patch) | |
| tree | 7025c1657d259e36d4079ac083ce5564ea2751e2 | |
| parent | 177deaf9a1d75043c14f0d7ef8385ece93adb07d (diff) | |
| download | emacs-1bcf5d02da96784a04034b4c0aba8fdfa1413c4e.tar.gz emacs-1bcf5d02da96784a04034b4c0aba8fdfa1413c4e.tar.bz2 emacs-1bcf5d02da96784a04034b4c0aba8fdfa1413c4e.zip | |
* lisp/vc/diff.el (diff-buffer-with-file): Support indirect buffers.
(Bug#32195)
| -rw-r--r-- | lisp/vc/diff.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el index b850350cd8a..ac94586cace 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el @@ -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) |