[Emacs-diffs] /srv/bzr/emacs/trunk r102514: * diff.el (diff): Fix it for good, hopefully, this time.

[Stefan Monnier]

------------------------------------------------------------
revno: 102514
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2010-11-25 16:59:30 -0500
message:
  * diff.el (diff): Fix it for good, hopefully, this time.
modified:
  lisp/vc/diff.el

=== modified file 'lisp/vc/diff.el'
--- a/lisp/vc/diff.el   2010-11-25 04:43:56 +0000
+++ b/lisp/vc/diff.el   2010-11-25 21:59:30 +0000
@@ -84,14 +84,13 @@
 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 "