Mercurial > emacs
changeset 70721:344d2021cd36
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 18 May 2006 23:59:14 +0000 |
| parents | 414922f8ea46 |
| children | 12f370a6caa1 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-sum.el man/ChangeLog man/gnus.texi |
| diffstat | 4 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Thu May 18 17:50:53 2006 +0000 +++ b/lisp/gnus/ChangeLog Thu May 18 23:59:14 2006 +0000 @@ -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.
--- a/lisp/gnus/gnus-sum.el Thu May 18 17:50:53 2006 +0000 +++ b/lisp/gnus/gnus-sum.el Thu May 18 23:59:14 2006 +0000 @@ -9507,7 +9507,7 @@ (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 @@ (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,
--- a/man/ChangeLog Thu May 18 17:50:53 2006 +0000 +++ b/man/ChangeLog Thu May 18 23:59:14 2006 +0000 @@ -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,
--- a/man/gnus.texi Thu May 18 17:50:53 2006 +0000 +++ b/man/gnus.texi Thu May 18 23:59:14 2006 +0000 @@ -7377,7 +7377,7 @@ @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