[Emacs-commit] emacs/lisp/mh-e mh-seq.el mh-mime.el mh-comp.el...

[Bill Wohler]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Bill Wohler <address@hidden>    06/01/04 01:03:20

Modified files:
        lisp/mh-e      : mh-seq.el mh-mime.el mh-comp.el ChangeLog 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-seq.el.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-mime.el.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-comp.el.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.93&tr2=1.94&r1=text&r2=text

Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.93 emacs/lisp/mh-e/ChangeLog:1.94
--- emacs/lisp/mh-e/ChangeLog:1.93      Tue Jan  3 18:25:26 2006
+++ emacs/lisp/mh-e/ChangeLog   Wed Jan  4 01:03:20 2006
@@ -1,5 +1,12 @@
 2006-01-03  Bill Wohler  <address@hidden>
 
+       * 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
Index: emacs/lisp/mh-e/mh-comp.el
diff -u emacs/lisp/mh-e/mh-comp.el:1.33 emacs/lisp/mh-e/mh-comp.el:1.34
--- emacs/lisp/mh-e/mh-comp.el:1.33     Tue Jan  3 06:13:43 2006
+++ emacs/lisp/mh-e/mh-comp.el  Wed Jan  4 01:03:20 2006
@@ -582,7 +582,7 @@
                 (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)))
Index: emacs/lisp/mh-e/mh-mime.el
diff -u emacs/lisp/mh-e/mh-mime.el:1.33 emacs/lisp/mh-e/mh-mime.el:1.34
--- emacs/lisp/mh-e/mh-mime.el:1.33     Tue Jan  3 06:13:42 2006
+++ emacs/lisp/mh-e/mh-mime.el  Wed Jan  4 01:03:20 2006
@@ -857,7 +857,7 @@
                     (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)
Index: emacs/lisp/mh-e/mh-seq.el
diff -u emacs/lisp/mh-e/mh-seq.el:1.19 emacs/lisp/mh-e/mh-seq.el:1.20
--- emacs/lisp/mh-e/mh-seq.el:1.19      Tue Jan  3 06:13:42 2006
+++ emacs/lisp/mh-e/mh-seq.el   Wed Jan  4 01:03:19 2006
@@ -420,9 +420,9 @@
 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 @@
                     (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 @@
                   (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)