From: Phil Sainty <psainty@orcon.net.nz>
Date: Wed, 18 Jul 2018 07:32:11 +0000 (+1200)
Subject: * lisp/vc/diff.el (diff-buffer-with-file): Support indirect buffers.
X-Git-Tag: emacs-27.0.90~4664^2~15
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1bcf5d02da96784a04034b4c0aba8fdfa1413c4e;p=emacs.git

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

(Bug#32195)
---

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)