2005-09-24 Emilio C. Lopes <eclig@gmx.net>

	* smime.el (smime-sign-buffer, smime-decrypt-buffer):
	* mm-view.el (mm-view-pkcs7-decrypt):
	* gnus-sum.el (gnus-summary-limit-to-extra)
	(gnus-summary-respool-article, gnus-read-move-group-name):
	* gnus-score.el (gnus-summary-increase-score):
	* gnus-util.el (gnus-completing-read-with-default):
	* gnus-art.el (gnus-read-save-file-name)
	(gnus-summary-save-in-rmail, gnus-summary-save-in-mail)
	(gnus-summary-save-in-file, gnus-summary-save-body-in-file):
	* message.el (message-check-news-header-syntax):
	Follow convention for reading with the minibuffer.

8 files changed, 42 insertions, 26 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 08fd723cf1f..bb81878502b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,8 +1,22 @@
+2005-09-24  Emilio C. Lopes  <eclig@gmx.net>
+
+        * smime.el (smime-sign-buffer, smime-decrypt-buffer):
+        * mm-view.el (mm-view-pkcs7-decrypt):
+        * gnus-sum.el (gnus-summary-limit-to-extra)
+        (gnus-summary-respool-article, gnus-read-move-group-name):
+        * gnus-score.el (gnus-summary-increase-score):
+        * gnus-util.el (gnus-completing-read-with-default):
+        * gnus-art.el (gnus-read-save-file-name)
+        (gnus-summary-save-in-rmail, gnus-summary-save-in-mail)
+        (gnus-summary-save-in-file, gnus-summary-save-body-in-file):
+        * message.el (message-check-news-header-syntax):
+        Follow convention for reading with the minibuffer.
+
 2005-09-18  D Goel  <deego@gnufans.org>
 
         * sieve.el (sieve-help): Fix `message' call: first arg should be a
         format spec.
-        
+
 2005-09-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.el (gnus-group-startup-message): Bind image-load-path.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 3821f9ecf18..4957d3ae98b 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -3255,7 +3255,7 @@ This format is defined by the `gnus-article-time-format' variable."
                       ((null split-name)
                        (read-file-name
                         (concat prompt " (default "
-                                (file-name-nondirectory default-name) ") ")
+                                (file-name-nondirectory default-name) "): ")
                         (file-name-directory default-name)
                         default-name))
                       ;; A single group name is returned.
@@ -3265,7 +3265,7 @@ This format is defined by the `gnus-article-time-format' variable."
                                       (symbol-value variable)))
                        (read-file-name
                         (concat prompt " (default "
-                                (file-name-nondirectory default-name) ") ")
+                                (file-name-nondirectory default-name) "): ")
                         (file-name-directory default-name)
                         default-name))
                       ;; A single split name was found
@@ -3278,7 +3278,7 @@ This format is defined by the `gnus-article-time-format' variable."
                                          ((file-exists-p name) name)
                                          (t gnus-article-save-directory))))
                          (read-file-name
-                          (concat prompt " (default " name ") ")
+                          (concat prompt " (default " name "): ")
                           dir name)))
                       ;; A list of splits was found.
                       (t
@@ -3289,7 +3289,7 @@ This format is defined by the `gnus-article-time-format' variable."
                            (setq result
                                  (expand-file-name
                                   (read-file-name
-                                   (concat prompt " (`M-p' for defaults) ")
+                                   (concat prompt " (`M-p' for defaults): ")
                                    gnus-article-save-directory
                                    (car split-name))
                                   gnus-article-save-directory)))
@@ -3323,7 +3323,7 @@ This format is defined by the `gnus-article-time-format' variable."
 Optional argument FILENAME specifies file name.
 Directory to save to is default to `gnus-article-save-directory'."
   (setq filename (gnus-read-save-file-name
-                  "Save %s in rmail file:" filename
+                  "Save %s in rmail file" filename
                   gnus-rmail-save-name gnus-newsgroup-name
                   gnus-current-headers 'gnus-newsgroup-last-rmail))
   (gnus-eval-in-buffer-window gnus-save-article-buffer
@@ -3338,7 +3338,7 @@ Directory to save to is default to `gnus-article-save-directory'."
 Optional argument FILENAME specifies file name.
 Directory to save to is default to `gnus-article-save-directory'."
   (setq filename (gnus-read-save-file-name
-                  "Save %s in Unix mail file:" filename
+                  "Save %s in Unix mail file" filename
                   gnus-mail-save-name gnus-newsgroup-name
                   gnus-current-headers 'gnus-newsgroup-last-mail))
   (gnus-eval-in-buffer-window gnus-save-article-buffer
@@ -3357,7 +3357,7 @@ Directory to save to is default to `gnus-article-save-directory'."
 Optional argument FILENAME specifies file name.
 Directory to save to is default to `gnus-article-save-directory'."
   (setq filename (gnus-read-save-file-name
-                  "Save %s in file:" filename
+                  "Save %s in file" filename
                   gnus-file-save-name gnus-newsgroup-name
                   gnus-current-headers 'gnus-newsgroup-last-file))
   (gnus-eval-in-buffer-window gnus-save-article-buffer
@@ -3381,7 +3381,7 @@ The directory to save in defaults to `gnus-article-save-directory'."
 Optional argument FILENAME specifies file name.
 The directory to save in defaults to `gnus-article-save-directory'."
   (setq filename (gnus-read-save-file-name
-                  "Save %s body in file:" filename
+                  "Save %s body in file" filename
                   gnus-file-save-name gnus-newsgroup-name
                   gnus-current-headers 'gnus-newsgroup-last-file))
   (gnus-eval-in-buffer-window gnus-save-article-buffer
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index e866f7f32fc..22a579c3d69 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -652,7 +652,7 @@ file for the command instead of the current score file."
                (intern                  ; need symbol
                 (gnus-completing-read-with-default
                  (symbol-name (car gnus-extra-headers)) ; default response
-                 "Score extra header:"  ; prompt
+                 "Score extra header"   ; prompt
                  (mapcar (lambda (x)    ; completion list
                            (cons (symbol-name x) x))
                          gnus-extra-headers)
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 88fe21fd5a2..c9e93d19f42 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -7696,8 +7696,8 @@ articles that are younger than AGE days."
            (gnus-completing-read-with-default
             (symbol-name (car gnus-extra-headers))
             (if current-prefix-arg
-                "Exclude extra header:"
-              "Limit extra header:")
+                "Exclude extra header"
+              "Limit extra header")
             (mapcar (lambda (x)
                       (cons (symbol-name x) x))
                     gnus-extra-headers)
@@ -9218,7 +9218,7 @@ latter case, they will be copied into the relevant groups."
                                         gnus-newsgroup-name)))))
                 (method
                  (gnus-completing-read-with-default
-                  methname "What backend do you want to use when respooling?"
+                  methname "Backend to use when respooling"
                   methods nil t nil 'gnus-mail-method-history))
                 ms)
            (cond
@@ -11044,7 +11044,7 @@ save those articles instead."
   (let* ((split-name (gnus-get-split-value gnus-move-split-methods))
          (minibuffer-confirm-incomplete nil) ; XEmacs
          (prom
-          (format "%s %s to:"
+          (format "%s %s to"
                   prompt
                   (if (> (length articles) 1)
                       (format "these %d articles" (length articles))
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 4c1721029be..5556a815d2a 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -335,8 +335,8 @@ is slower."
 (defun gnus-completing-read-with-default (default prompt &rest args)
   ;; Like `completing-read', except that DEFAULT is the default argument.
   (let* ((prompt (if default
-                     (concat prompt " (default " default ") ")
-                   (concat prompt " ")))
+                     (concat prompt " (default " default "): ")
+                   (concat prompt ": ")))
          (answer (apply 'completing-read prompt args)))
     (if (or (null answer) (zerop (length answer)))
         default
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 5995fcbcea0..55f07183753 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4197,7 +4197,7 @@ Otherwise, generate and save a value for `canlock-password' first."
                    (zerop
                     (length
                      (setq to (completing-read
-                               "Followups to (default: no Followup-To header) "
+                               "Followups to (default no Followup-To header): "
                                (mapcar #'list
                                        (cons "poster"
                                              (message-tokenize-header
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index ac408aa179f..dec03bf0b9c 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -576,9 +576,10 @@
        (cadar smime-keys)
      (smime-get-key-by-email
       (gnus-completing-read-maybe-default
-       (concat "Decipher using which key? "
-               (if smime-keys (concat "(default " (caar smime-keys) ") ")
-                 ""))
+       (concat "Decipher using key"
+               (if smime-keys
+                   (concat " (default " (caar smime-keys) "): ")
+                 ": "))
        smime-keys nil nil nil nil (car-safe (car-safe smime-keys))))))
   (goto-char (point-min))
   (while (search-forward "\r\n" nil t)
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 485cf177154..22489affa89 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -341,9 +341,10 @@ KEYFILE should contain a PEM encoded key and certificate."
                  keyfile
                (smime-get-key-with-certs-by-email
                 (completing-read
-                 (concat "Sign using which key? "
-                         (if smime-keys (concat "(default " (caar smime-keys) ") ")
-                           ""))
+                 (concat "Sign using key"
+                         (if smime-keys
+                             (concat " (default " (caar smime-keys) "): ")
+                           ": "))
                  smime-keys nil nil (car-safe (car-safe smime-keys))))))
       (error "Signing failed"))))
 
@@ -472,9 +473,9 @@ in the buffer specified by `smime-details-buffer'."
       (or keyfile
           (smime-get-key-by-email
            (completing-read
-            (concat "Decipher using which key? "
-                    (if smime-keys (concat "(default " (caar smime-keys) ") ")
-                      ""))
+            (concat "Decipher using key"
+                    (if smime-keys (concat " (default " (caar smime-keys) "): ")
+                      ": "))
             smime-keys nil nil (car-safe (car-safe smime-keys)))))))))
 
 ;; Various operations