# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1086216285 0
# Node ID 3c32f5d8430f2209f82248645932bc0d577013d2
# Parent  e046a551c6da3b05cc5a3ce77b4063b4449c837a
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 -r e046a551c6da -r 3c32f5d8430f lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jun 02 22:43:42 2004 +0000
+++ b/lisp/ChangeLog	Wed Jun 02 22:44:45 2004 +0000
@@ -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 -r e046a551c6da -r 3c32f5d8430f lisp/subr.el
--- a/lisp/subr.el	Wed Jun 02 22:43:42 2004 +0000
+++ b/lisp/subr.el	Wed Jun 02 22:44:45 2004 +0000
@@ -1335,9 +1335,11 @@
   (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