Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363

(read-number): Use canonical format for default in prompt.

2004-06-03  Miles Bader  <miles@gnu.org>

   * lisp/subr.el (read-number): Use canonical format for default in prompt.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 72441a20147055c68f14ff30ce83fb410e2578e7..83f8a0e1cf05a15ff2933138c102f019d0c012b6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2004-06-03  Miles Bader  <miles@gnu.org>
 
+       * subr.el (read-number): Use canonical format for default in prompt.
+
        * minibuf-eldef.el (minibuffer-default-in-prompt-regexps): Add
        regexp for " [...]" style defaults.
 

diff --git a/lisp/subr.el b/lisp/subr.el
index b90efd46ff0120b9b65aaf2c6b544e15fb42d43a..e4e38d906c69bc3159cd81d14c0b0b0eda1f18c3 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1335,9 +1335,11 @@ Optional DEFAULT is a default password to use instead of empty input."
   (let ((n nil))
     (when default
       (setq prompt
-           (if (string-match "\\(\\):[^:]*" prompt)
-               (replace-match (format " [%s]" default) t t prompt 1)
-             (concat prompt (format " [%s] " default)))))
+           (if (string-match "\\(\\):[ \t]*\\'" prompt)
+               (replace-match (format " (default %s)" default) t t prompt 1)
+             (replace-regexp-in-string "[ \t]*\\'"
+                                       (format " (default %s) " default)
+                                       prompt t t)))) 
     (while
        (progn
          (let ((str (read-from-minibuffer prompt nil nil nil nil