From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 25 Nov 2010 21:59:30 +0000 (-0500)
Subject: * diff.el (diff): Fix it for good, hopefully, this time.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~117
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5a973d51646a208d88d7dd882e32077b9d08298a;p=emacs.git

* diff.el (diff): Fix it for good, hopefully, this time.
---

diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index 13c23eea734..5809eee9aef 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -84,14 +84,13 @@ When called interactively with a prefix argument, prompt
 interactively for diff switches.  Otherwise, the switches
 specified in `diff-switches' are passed to the diff command."
   (interactive
-   (let* ((newf (buffer-file-name))
-          (oldf (file-newest-backup newf)))
-     (setq newf (if (and newf (file-exists-p newf))
+   (let* ((newf (if (and buffer-file-name (file-exists-p buffer-file-name))
 		    (read-file-name
 		     (concat "Diff new file (default "
-			     (file-name-nondirectory newf) "): ")
-		     nil newf t)
+			     (file-name-nondirectory buffer-file-name) "): ")
+		     nil buffer-file-name t)
 		  (read-file-name "Diff new file: " nil nil t)))
+          (oldf (file-newest-backup newf)))
      (setq oldf (if (and oldf (file-exists-p oldf))
 		    (read-file-name
 		     (concat "Diff original file (default "