Mercurial > emacs

changeset 19126:c57d673ff676

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-version-diff): Use defaults, not initial input, for reading the arguments.
author Richard M. Stallman <rms@gnu.org>
date Mon, 04 Aug 1997 04:29:53 +0000
parents 8aad7cef6fc0
children ce44f2008a22
files lisp/vc.el
diffstat 1 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc.el	Mon Aug 04 04:23:51 1997 +0000
+++ b/lisp/vc.el	Mon Aug 04 04:29:53 1997 +0000
@@ -1302,8 +1302,7 @@
 files in or below it."
   (interactive 
    (let ((file (read-file-name "File or directory to diff: "
-                                default-directory buffer-file-name t 
-                                (file-name-nondirectory buffer-file-name)))
+                                default-directory buffer-file-name t))
          (rel1-default nil) (rel2-default nil))
      ;; compute default versions based on the file state
      (cond
@@ -1319,8 +1318,16 @@
        (setq rel2-default (vc-workfile-version file))))
      ;; construct argument list
      (list file 
-           (read-string "Older version: " rel1-default)
-           (read-string "Newer version: " rel2-default))))
+           (read-string (if rel1-default
+			    (concat "Older version: (default "
+				    rel1-default ") ")
+			  "Older version: ")
+			nil nil rel1-default)
+           (read-string (if rel2-default
+			    (concat "Newer version: (default "
+				    rel2-default ") ")
+			  "Newer version: ")
+			nil nil rel2-default))))
   (if (string-equal rel1 "") (setq rel1 nil))
   (if (string-equal rel2 "") (setq rel2 nil))
   (if (file-directory-p file)