Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-214

Merge from gnus--rel--5.10

Patches applied:

 * emacs--cvs-trunk--0  (patch 553, 559-561)

   - Merge from gnus--rel--5.10
   - Update from CVS

 * gnus--rel--5.10  (patch 125)

   - Merge from emacs--cvs-trunk--0

2005-09-25  Romain Francoise  <romain@orebokech.com>

   * lisp/gnus-agent.el (gnus-agent-expire-group, gnus-agent-expire):
   * lisp/gnus-start.el (gnus-subscribe-interactively):
   * lisp/gnus-uu.el (gnus-uu-grab-articles):
   End `yes-or-no-p' and `y-or-n-p' prompts with question mark and
   space.

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

   * lisp/smime.el (smime-sign-buffer, smime-decrypt-buffer):
   * lisp/mm-view.el (mm-view-pkcs7-decrypt):
   * lisp/gnus-sum.el (gnus-summary-limit-to-extra)
   (gnus-summary-respool-article, gnus-read-move-group-name):
   * lisp/gnus-score.el (gnus-summary-increase-score):
   * lisp/gnus-util.el (gnus-completing-read-with-default):
   * lisp/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):
   * lisp/message.el (message-check-news-header-syntax):
   Follow convention for reading with the minibuffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 12aba52..33ddc63 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,25 @@
+2005-09-25  Romain Francoise  <romain@orebokech.com>
+
+       * gnus-agent.el (gnus-agent-expire-group, gnus-agent-expire):
+       * gnus-start.el (gnus-subscribe-interactively):
+       * gnus-uu.el (gnus-uu-grab-articles):
+       End `yes-or-no-p' and `y-or-n-p' prompts with question mark and
+       space.
+
+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-22  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * spam-report.el (spam-report-url-ping-plain): Use

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index cd54fa2..75a4b98 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -2971,7 +2971,7 @@ FORCE is equivalent to setting the expiration predicates to true."
       (if (or (not (eq articles t))
               (yes-or-no-p
                (concat "Are you sure that you want to "
-                       "expire all articles in " group ".")))
+                       "expire all articles in " group "? ")))
           (let ((gnus-command-method (gnus-find-method-for-group group))
                 (overview (gnus-get-buffer-create " *expire overview*"))
                 orig)
@@ -3380,7 +3380,7 @@ FORCE is equivalent to setting the expiration predicates to true."
       (gnus-agent-expire-group group articles force)
     (if (or (not (eq articles t))
             (yes-or-no-p "Are you sure that you want to expire all \
-articles in every agentized group."))
+articles in every agentized group? "))
         (let ((methods (gnus-agent-covered-methods))
               ;; Bind gnus-agent-expire-current-dirs to enable tracking
               ;; of agent directories.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index a020b67..9533f58 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3309,7 +3309,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.
@@ -3319,7 +3319,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
@@ -3332,7 +3332,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
@@ -3343,7 +3343,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)))
@@ -3377,7 +3377,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
@@ -3392,7 +3392,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
@@ -3411,7 +3411,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
@@ -3435,7 +3435,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-score.el b/lisp/gnus-score.el
index 3a4a158..febdc26 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -663,7 +663,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-start.el b/lisp/gnus-start.el
index 88f33ca..99fa173 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -612,7 +612,7 @@ Can be used to turn version control on or off."
   "Subscribe the new GROUP interactively.
 It is inserted in hierarchical newsgroup order if subscribed.  If not,
 it is killed."
-  (if (gnus-y-or-n-p (format "Subscribe new newsgroup: %s " group))
+  (if (gnus-y-or-n-p (format "Subscribe new newsgroup %s? " group))
       (gnus-subscribe-hierarchically group)
     (push group gnus-killed-list)))
 

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 18c92f3..f7bd491 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7812,8 +7812,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)
@@ -9378,7 +9378,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
@@ -11211,7 +11211,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-util.el b/lisp/gnus-util.el
index eba6eae..c8df319 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -308,8 +308,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-uu.el b/lisp/gnus-uu.el
index 275ad20..08c9bce 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -1307,7 +1307,7 @@ When called interactively, prompt for REGEXP."
                       (not gnus-uu-be-dangerous)
                       (or (eq gnus-uu-be-dangerous t)
                           (gnus-y-or-n-p
-                           (format "Delete unsuccessfully decoded file %s"
+                           (format "Delete unsuccessfully decoded file %s? "
                                    result-file))))
              (delete-file result-file)))
          (when (memq 'begin process-state)

diff --git a/lisp/message.el b/lisp/message.el
index 4114e5b..7bfcf0a 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4285,7 +4285,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/mm-view.el b/lisp/mm-view.el
index 585b59b..ed63669 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -597,9 +597,9 @@
        (cadar smime-keys)
      (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 nil nil (car-safe (car-safe smime-keys))))))
   (goto-char (point-min))
   (while (search-forward "\r\n" nil t)

diff --git a/lisp/smime.el b/lisp/smime.el
index 369f92a..fe8bb31 100644 (file)
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -367,9 +367,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"))))
 
@@ -498,9 +499,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