diff options
| author | Richard M. Stallman <rms@gnu.org> | 1997-08-04 04:29:53 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1997-08-04 04:29:53 +0000 |
| commit | 8e710301e0063ed124cc5e589ab33729ae53fb84 (patch) | |
| tree | e9282b1204bf09ea88c5c14c9433a7d10c4c1639 /lisp/vc.el | |
| parent | f60a629a96cfbeb5a9a88750122f951821333566 (diff) | |
| download | emacs-8e710301e0063ed124cc5e589ab33729ae53fb84.tar.gz | |
(vc-version-diff): Use defaults, not initial input,
for reading the arguments.
Diffstat (limited to 'lisp/vc.el')
| -rw-r--r-- | lisp/vc.el | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index bcee7f8ba0c..cde088d2176 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -1302,8 +1302,7 @@ If FILE is a directory, generate diffs between versions for all registered 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 @@ files in or below it." (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) |