aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2010-11-24 23:43:56 -0500
committerStefan Monnier2010-11-24 23:43:56 -0500
commitd5e7b0d83d9f9a44812d75794ed6cbc8e626ee41 (patch)
tree121b06c0eb48dbc926216f508e462075be0599c9
parentbbf9f302f3d700f70a1c29592a5a803c1173eaca (diff)
downloademacs-d5e7b0d83d9f9a44812d75794ed6cbc8e626ee41.tar.gz
emacs-d5e7b0d83d9f9a44812d75794ed6cbc8e626ee41.zip
* lisp/vc/diff.el (diff): Fix last change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc/diff.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b79f070956f..bbe0b7c865c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-11-25 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * vc/diff.el (diff): Fix last change.
4
12010-11-24 Stefan Monnier <monnier@iro.umontreal.ca> 52010-11-24 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * emacs-lisp/pcase.el: Improve pcase-let. Use "pcase--" prefix. 7 * emacs-lisp/pcase.el: Improve pcase-let. Use "pcase--" prefix.
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index 5c0a222cffd..13c23eea734 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -84,8 +84,8 @@ When called interactively with a prefix argument, prompt
84interactively for diff switches. Otherwise, the switches 84interactively for diff switches. Otherwise, the switches
85specified in `diff-switches' are passed to the diff command." 85specified in `diff-switches' are passed to the diff command."
86 (interactive 86 (interactive
87 (let ((newf (buffer-file-name)) 87 (let* ((newf (buffer-file-name))
88 (oldf (file-newest-backup newf))) 88 (oldf (file-newest-backup newf)))
89 (setq newf (if (and newf (file-exists-p newf)) 89 (setq newf (if (and newf (file-exists-p newf))
90 (read-file-name 90 (read-file-name
91 (concat "Diff new file (default " 91 (concat "Diff new file (default "