From d88a70a010ef76c08f37497b551a4fc620059096 Mon Sep 17 00:00:00 2001 From: Romain Francoise Date: Sat, 24 Sep 2005 13:45:50 +0000 Subject: [PATCH] 2005-09-24 Emilio C. Lopes * mh-mime.el (mh-compose-forward, mh-mhn-compose-forw): * mh-comp.el (mh-insert-letter): * mh-utils.el (mh-prompt-for-folder): Follow convention for reading with the minibuffer. --- lisp/mh-e/ChangeLog | 7 +++++++ lisp/mh-e/mh-comp.el | 6 +++--- lisp/mh-e/mh-mime.el | 12 ++++++------ lisp/mh-e/mh-utils.el | 6 +++--- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 631bc5cb6a3..e851b399ce0 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,10 @@ +2005-09-24 Emilio C. Lopes + + * mh-mime.el (mh-compose-forward, mh-mhn-compose-forw): + * mh-comp.el (mh-insert-letter): + * mh-utils.el (mh-prompt-for-folder): + Follow convention for reading with the minibuffer. + 2005-09-19 Juanma Barranquero * mh-print.el (mh-ps-print-msg-show): Fix misplaced parenthesis in diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el index 59111098bf1..a99c05debea 100644 --- a/lisp/mh-e/mh-comp.el +++ b/lisp/mh-e/mh-comp.el @@ -1424,10 +1424,10 @@ not indent and do not delete headers. Leaves the mark before the letter and point after it." (interactive (list (mh-prompt-for-folder "Message from" mh-sent-from-folder nil) - (read-input (format "Message number%s: " + (read-input (concat "Message number" (if (numberp mh-sent-from-msg) - (format " [%d]" mh-sent-from-msg) - ""))) + (format " (default %d): " mh-sent-from-msg) + ": "))) current-prefix-arg)) (save-restriction (narrow-to-region (point) (point)) diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index 980942a0f47..527d322c48a 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -81,10 +81,10 @@ If any of the optional arguments are absent, they are prompted for." (interactive (list (read-string "Forw Content-description: ") (mh-prompt-for-folder "Message from" mh-sent-from-folder nil) - (read-string (format "Messages%s: " + (read-string (concat "Messages" (if (numberp mh-sent-from-msg) - (format " [%d]" mh-sent-from-msg) - ""))))) + (format " (default %d): " mh-sent-from-msg) + ": "))))) (if (equal mh-compose-insertion 'gnus) (mh-mml-forward-message description folder message) (mh-mhn-compose-forw description folder message))) @@ -374,10 +374,10 @@ See also \\[mh-edit-mhn]." (interactive (list (read-string "Forw Content-description: ") (mh-prompt-for-folder "Message from" mh-sent-from-folder nil) - (read-string (format "Messages%s: " + (read-string (concat "Messages" (if (numberp mh-sent-from-msg) - (format " [%d]" mh-sent-from-msg) - ""))))) + (format " (default %d): " mh-sent-from-msg) + ": "))))) (beginning-of-line) (insert "#forw [") (and description diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el index 522ccda088c..0e608e52062 100644 --- a/lisp/mh-e/mh-utils.el +++ b/lisp/mh-e/mh-utils.el @@ -2315,10 +2315,10 @@ non-nil then the function will accept the folder +, which means all folders when used in searching." (if (null default) (setq default "")) - (let* ((default-string (cond (default-string (format "[%s] " default-string)) + (let* ((default-string (cond (default-string (format " (default %s)" default-string)) ((equal "" default) "") - (t (format "[%s] " default)))) - (prompt (format "%s folder: %s" prompt default-string)) + (t (format " (default %s)" default)))) + (prompt (format "%s folder%s: " prompt default-string)) (mh-current-folder-name mh-current-folder) read-name folder-name) (while (and (setq read-name (mh-folder-completing-read -- 2.39.2