Merge from gnus--rel--5.10

Patches applied:

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

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-287

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3cba77d4b21905e99f24c66947bb08105f2bf8b3..1e5bfa23ed3a978440ca83db6688bf966aa36ac9 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-18  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * gnus-sum.el (gnus-summary-save-article-mail): Clarify doc string.
+       (gnus-summary-expire-articles-now): Shorten prompt.
+
        * gmm-utils.el (wid-edit): Require.
        (defun-gmm): Renamed from `gmm-defun-compat'.
        (gmm-image-search-load-path): Use it.

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index daecb1701cd304a98b103de9008eb167eb4355d5..5208ae27eb9164d2c3278049a42cf8dd94bd881e 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -9507,7 +9507,7 @@ deleted forever, right now."
   (interactive)
   (or gnus-expert-user
       (gnus-yes-or-no-p
-       "Are you really, really, really sure you want to delete all these messages? ")
+       "Are you really, really sure you want to delete all expirable messages? ")
       (error "Phew!"))
   (gnus-summary-expire-articles t))
 
@@ -11043,7 +11043,7 @@ If HEADERS (the symbolic prefix), include the headers, too."
       (gnus-configure-windows 'pipe))))
 
 (defun gnus-summary-save-article-mail (&optional arg)
-  "Append the current article to an mail file.
+  "Append the current article to a Unix mail box file.
 If N is a positive number, save the N next articles.
 If N is a negative number, save the N previous articles.
 If N is nil and any articles have been marked with the process mark,

diff --git a/man/ChangeLog b/man/ChangeLog
index 5641f1332771da3c5d8825316185ad7f0d41ff2e..1f716090c734648a70a8ab595c28b9e9b609a3b6 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-18  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus.texi (Saving Articles): Clarify gnus-summary-save-article-mail.
+
 2006-05-17  Richard Stallman  <rms@gnu.org>
 
        * files.texi (Diff Mode): Mention C-x `.
@@ -6230,6 +6234,7 @@
 
 ;; Local Variables:
 ;; coding: iso-2022-7bit
+;; fill-column: 79
 ;; End:
 
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,

diff --git a/man/gnus.texi b/man/gnus.texi
index 9623bc468d999a356b929c2c5ec7d349b91ccb2e..b1654b8302fc5ae5f8067b4b499e68f35dd090de 100644 (file)
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -7377,7 +7377,7 @@ Save the current article using the default article saver
 @item O m
 @kindex O m (Summary)
 @findex gnus-summary-save-article-mail
-Save the current article in mail format
+Save the current article in a Unix mail box (mbox) file
 (@code{gnus-summary-save-article-mail}).
 
 @item O r