]> git.eshelyaron.com Git - emacs.git/commitdiff
* lisp/vc/diff.el (diff-buffer-with-file): Support indirect buffers.
authorPhil Sainty <psainty@orcon.net.nz>
Wed, 18 Jul 2018 07:32:11 +0000 (19:32 +1200)
committerPhil Sainty <psainty@orcon.net.nz>
Sat, 28 Jul 2018 12:30:01 +0000 (00:30 +1200)
(Bug#32195)

lisp/vc/diff.el

index b850350cd8ab6f282bfd065c8af2bbd08fb91a40..ac94586caceb4c9c0bd8a10ec4a2f43c719045b7 100644 (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)