From f18df03d4a0494455b1cfc9540c725b2081fce65 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Thu, 18 May 2006 23:59:14 +0000 Subject: [PATCH] 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 --- lisp/gnus/ChangeLog | 3 +++ lisp/gnus/gnus-sum.el | 4 ++-- man/ChangeLog | 5 +++++ man/gnus.texi | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 3cba77d4b21..1e5bfa23ed3 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,8 @@ 2006-05-18 Reiner Steib + * 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 daecb1701cd..5208ae27eb9 100644 --- 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 5641f133277..1f716090c73 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2006-05-18 Reiner Steib + + * gnus.texi (Saving Articles): Clarify gnus-summary-save-article-mail. + 2006-05-17 Richard Stallman * 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 9623bc468d9..b1654b8302f 100644 --- 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 -- 2.39.5