From 078cb3146bd2c659c3f2b9b55f401b73da77e6dc Mon Sep 17 00:00:00 2001
From: Bill Wohler <wohler@newt.com>
Date: Wed, 4 Jan 2006 01:03:20 +0000
Subject: [PATCH] * mh-comp.el (mh-reply): Use standard default notation in
 prompts (closes SF #1275933).

* mh-mime.el (mh-mime-save-parts): Ditto.

* mh-seq.el (mh-read-seq, mh-read-range): Ditto.
---
 lisp/mh-e/ChangeLog  |  7 +++++++
 lisp/mh-e/mh-comp.el |  2 +-
 lisp/mh-e/mh-mime.el |  2 +-
 lisp/mh-e/mh-seq.el  | 28 +++++++++++++++-------------
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 4116fb4223c..e0da0950715 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,5 +1,12 @@
 2006-01-03  Bill Wohler  <wohler@newt.com>
 
+	* mh-comp.el (mh-reply): Use standard default notation in
+	prompts (closes SF #1275933).
+
+	* mh-mime.el (mh-mime-save-parts): Ditto.
+
+	* mh-seq.el (mh-read-seq, mh-read-range): Ditto.
+
 	* mh-customize.el (mh-folder-msg-number): Snow is actually
 	off-white on low color displays which turns to white when bold.
 	This is unreadable on white backgrounds. Use snow with min-colors
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 63c35fd221f..ddab3725058 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -582,7 +582,7 @@ See also `mh-reply-show-message-flag',
                 (let ((minibuffer-help-form
                        "from => Sender only\nto => Sender and primary recipients\ncc or all => Sender and all recipients"))
                   (or mh-reply-default-reply-to
-                      (completing-read "Reply to whom: [from] "
+                      (completing-read "Reply to whom (default from): "
                                        '(("from") ("to") ("cc") ("all"))
                                        nil
                                        t)))
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 9edcf10b36d..d8102fe6582 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -857,7 +857,7 @@ do the work."
                     (equal t mh-mime-save-parts-default-directory))
                 mh-mime-save-parts-directory)
            (read-file-name (format
-                            "Store in directory: [%s] "
+                            "Store in directory (default %s): "
                             mh-mime-save-parts-directory)
                            "" mh-mime-save-parts-directory t ""))
           ((stringp mh-mime-save-parts-default-directory)
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index dffb831ad2b..5dab59b270f 100644
--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@@ -420,9 +420,9 @@ Prompt with PROMPT, raise an error if the sequence is empty and
 the NOT-EMPTY flag is non-nil, and supply an optional DEFAULT
 sequence. A reply of '%' defaults to the first sequence
 containing the current message."
-  (let* ((input (completing-read (format "%s %s %s" prompt "sequence:"
+  (let* ((input (completing-read (format "%s sequence%s: " prompt
                                          (if default
-                                             (format "[%s] " default)
+                                             (format " (default %s)" default)
                                            ""))
                                  (mh-seq-names mh-seq-list)
                                  nil nil nil 'mh-sequence-history))
@@ -513,20 +513,22 @@ should be replaced with:
                     (car (mh-seq-containing-msg (mh-get-msg-num nil) t)))
         prompt (format "%s range" prompt))
   (let* ((folder (or folder mh-current-folder))
-         (default (cond ((or (eq default t) (stringp default)) default)
-                        ((symbolp default) (symbol-name default))))
          (guess (eq default t))
          (counts (and guess (mh-folder-size folder)))
          (unseen (and counts (> (cadr counts) 0)))
          (large (and counts mh-large-folder (> (car counts) mh-large-folder)))
-         (str (cond ((and guess large
-                          (setq default (format "last:%s" mh-large-folder)
-                                prompt (format "%s (folder has %s messages)"
-                                               prompt (car counts)))
-                          nil))
-                    ((and guess (not large) (setq default "all") nil))
-                    ((eq default nil) "")
-                    (t (format "[%s] " default))))
+         (default (cond ((and guess large) (format "last:%s" mh-large-folder))
+                        ((and guess (not large)) "all")
+                        ((stringp default) default)
+                        ((symbolp default) (symbol-name default))))
+         (prompt (cond ((and guess large default)
+                        (format "%s (folder has %s messages, default %s)"
+                                prompt (car counts) default))
+                       ((and guess large)
+                        (format "%s (folder has %s messages)"
+                                prompt (car counts)))
+                       (default
+                         (format "%s (default %s)" prompt default))))
          (minibuffer-local-completion-map mh-range-completion-map)
          (seq-list (if (eq folder mh-current-folder)
                        mh-seq-list
@@ -536,7 +538,7 @@ should be replaced with:
                   (mh-seq-names seq-list)))
          (input (cond ((and (not ask-flag) unseen) (symbol-name mh-unseen-seq))
                       ((and (not ask-flag) (not large)) "all")
-                      (t (completing-read (format "%s: %s" prompt str)
+                      (t (completing-read (format "%s: " prompt)
                                           'mh-range-completion-function nil nil
                                           nil 'mh-range-history default))))
          msg-list)
-- 
2.39.2