mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-16 09:50:25 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Stefan Monnier 2010-11-25 16:59:30 -05:00
parent 123652403c
commit 5a973d5164
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/vc/diff.el
View File

@ -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 "