Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-85

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 556-561)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 122-124)

   - Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp.
   - Update from CVS

1 files changed, 4 insertions, 4 deletions

diff --git a/lisp/diff.el b/lisp/diff.el
index 7602ecb0e37..8c4332b2da2 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -83,15 +83,15 @@ With prefix arg, prompt for diff switches."
      (setq newf (buffer-file-name)
            newf (if (and newf (file-exists-p newf))
                     (read-file-name
-                     (concat "Diff new file: (default "
-                             (file-name-nondirectory newf) ") ")
+                     (concat "Diff new file (default "
+                             (file-name-nondirectory newf) "): ")
                      nil newf t)
                   (read-file-name "Diff new file: " nil nil t)))
      (setq oldf (file-newest-backup newf)
            oldf (if (and oldf (file-exists-p oldf))
                     (read-file-name
-                     (concat "Diff original file: (default "
-                             (file-name-nondirectory oldf) ") ")
+                     (concat "Diff original file (default "
+                             (file-name-nondirectory oldf) "): ")
                      (file-name-directory oldf) oldf t)
                   (read-file-name "Diff original file: "
                                   (file-name-directory newf) nil t)))