diff options
author | Bill Wohler <[email protected]> | 2006-01-04 01:03:20 +0000 |
---|---|---|
committer | Bill Wohler <[email protected]> | 2006-01-04 01:03:20 +0000 |
commit | 078cb3146bd2c659c3f2b9b55f401b73da77e6dc (patch) | |
tree | 7d4bc5bf3c2248eaf47b5f0bc6531afe550367b9 /lisp/mh-e/mh-seq.el | |
parent | 8a5db8aea1941c29f6fd0030756d058fd3d1fb54 (diff) |
* 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.
Diffstat (limited to 'lisp/mh-e/mh-seq.el')
-rw-r--r-- | lisp/mh-e/mh-seq.el | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el index dffb831ad2..5dab59b270 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) |