From 5a973d51646a208d88d7dd882e32077b9d08298a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 25 Nov 2010 16:59:30 -0500 Subject: [PATCH] * diff.el (diff): Fix it for good, hopefully, this time. --- lisp/vc/diff.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 " -- 2.39.2