diff options
| author | Miles Bader | 2001-10-11 01:20:16 +0000 |
|---|---|---|
| committer | Miles Bader | 2001-10-11 01:20:16 +0000 |
| commit | 219637a43aaf3abb3b7997912736eda12227b7ca (patch) | |
| tree | 2d303f34ade02736e4443c01f2890052e1c49e93 /lisp/diff.el | |
| parent | 968b7671aa295f66af0cf0b3f3a57acf93c10e19 (diff) | |
| download | emacs-219637a43aaf3abb3b7997912736eda12227b7ca.tar.gz emacs-219637a43aaf3abb3b7997912736eda12227b7ca.zip | |
(diff): Display default values in prompts as `(default ...)', not `(...)'.
Diffstat (limited to 'lisp/diff.el')
| -rw-r--r-- | lisp/diff.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/diff.el b/lisp/diff.el index 1c897a20974..fb1793e627b 100644 --- a/lisp/diff.el +++ b/lisp/diff.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; diff.el --- run `diff' in compilation-mode | 1 | ;;; diff.el --- run `diff' in compilation-mode |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992, 1994, 1996, 2001 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Maintainer: FSF | 5 | ;; Maintainer: FSF |
| 6 | ;; Keywords: unix, tools | 6 | ;; Keywords: unix, tools |
| @@ -199,14 +199,14 @@ With prefix arg, prompt for diff switches." | |||
| 199 | (setq newf (buffer-file-name) | 199 | (setq newf (buffer-file-name) |
| 200 | newf (if (and newf (file-exists-p newf)) | 200 | newf (if (and newf (file-exists-p newf)) |
| 201 | (read-file-name | 201 | (read-file-name |
| 202 | (concat "Diff new file: (" | 202 | (concat "Diff new file: (default " |
| 203 | (file-name-nondirectory newf) ") ") | 203 | (file-name-nondirectory newf) ") ") |
| 204 | nil newf t) | 204 | nil newf t) |
| 205 | (read-file-name "Diff new file: " nil nil t))) | 205 | (read-file-name "Diff new file: " nil nil t))) |
| 206 | (setq oldf (file-newest-backup newf) | 206 | (setq oldf (file-newest-backup newf) |
| 207 | oldf (if (and oldf (file-exists-p oldf)) | 207 | oldf (if (and oldf (file-exists-p oldf)) |
| 208 | (read-file-name | 208 | (read-file-name |
| 209 | (concat "Diff original file: (" | 209 | (concat "Diff original file: (default " |
| 210 | (file-name-nondirectory oldf) ") ") | 210 | (file-name-nondirectory oldf) ") ") |
| 211 | (file-name-directory oldf) oldf t) | 211 | (file-name-directory oldf) oldf t) |
| 212 | (read-file-name "Diff original file: " | 212 | (read-file-name "Diff original file: " |