From 2af7cc31cfb2c56e4cd94efb38d1ca0dbb58eaba Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Wed, 16 Aug 2006 14:06:02 +0000 Subject: [PATCH] Merge from gnus--rel--5.10 Patches applied: * emacs--devo--0 (patch 362, 367, 369, 375, 393, 398) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 126) - Merge from emacs--devo--0 2006-08-13 Romain Francoise * lisp/mm-extern.el (mm-extern-mail-server): End `y-or-n-p' prompt with a space. 2006-07-18 Karl Fogel * lisp/nnmail.el (nnmail-article-group): If splitting raises an error, give some information about the error when saying that the `bogus' mail group will be used. 2006-07-24 Richard Stallman * texi/pgg.texi: Move periods and commas inside quotes. Revision: emacs@sv.gnu.org/gnus--devo--0--patch-186 --- lisp/ChangeLog | 34 ++++++++++++++++++++++------------ lisp/mm-extern.el | 2 +- lisp/nnmail.el | 4 ++-- texi/ChangeLog | 4 ++++ texi/pgg.texi | 2 +- 5 files changed, 30 insertions(+), 16 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0d9347117..b638cd39d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-08-13 Romain Francoise + + * mm-extern.el (mm-extern-mail-server): End `y-or-n-p' prompt with a + space. + 2006-08-09 Katsumi Yamaoka * compface.el (uncompface): Use binary rather than raw-text-unix. @@ -91,6 +96,12 @@ * gnus-sum.el (gnus-select-newsgroup): Setup the article buffer correctly. This fixes a bug caused by the 2006-05-12 change. +2006-07-18 Karl Fogel + + * nnmail.el (nnmail-article-group): If splitting raises an error, give + some information about the error when saying that the `bogus' mail + group will be used. + 2006-07-17 Reiner Steib * gnus-sum.el (gnus-summary-delete-article): Don't use TAB in doc @@ -506,8 +517,7 @@ 2006-05-03 Stefan Monnier - * gnus-art.el (gnus-mime-view-part-as-type): Add optional PRED - argument. + * gnus-art.el (gnus-mime-view-part-as-type): Add optional PRED arg. (gnus-mime-view-part-externally, gnus-mime-view-part-internally): Try harder to show the attachment internally or externally using gnus-mime-view-part-as-type. @@ -709,13 +719,13 @@ 2006-04-20 Reiner Steib - * gnus-util.el (gnus-replace-in-string): Prefer - replace-regexp-in-string over of replace-in-string. + * gnus-util.el (gnus-replace-in-string): + Prefer replace-regexp-in-string over of replace-in-string. 2006-04-20 Katsumi Yamaoka - * gnus-util.el (gnus-select-frame-set-input-focus): Use - select-frame-set-input-focus if it is available in XEmacs; use + * gnus-util.el (gnus-select-frame-set-input-focus): + Use select-frame-set-input-focus if it is available in XEmacs; use definition defined in Emacs 22 for old Emacsen. * dgnushack.el: Autoload unmorse-region for XEmacs. @@ -1205,8 +1215,8 @@ * gnus-agent.el (gnus-agent-queue-mail): Fix custom tag for `t'. - * spam.el (spam-mark-new-messages-in-spam-group-as-spam): Add - comment on version. + * spam.el (spam-mark-new-messages-in-spam-group-as-spam): + Add comment on version. 2006-03-20 Reiner Steib @@ -1251,8 +1261,8 @@ * gnus-art.el (gnus-article-only-boring-p): Bind inhibit-point-motion-hooks to avoid infinite loop when entering - intangible text. Reported by Ralf Wachinger - . + intangible text. + Reported by Ralf Wachinger . 2006-03-14 Reiner Steib @@ -1262,8 +1272,8 @@ 2006-03-14 Simon Josefsson * message.el (message-unique-id): Don't use message-number-base36 - if (user-uid) is a float. Reported by Bjorn Solberg - . + if (user-uid) is a float. + Reported by Bjorn Solberg . 2006-03-13 Katsumi Yamaoka diff --git a/lisp/mm-extern.el b/lisp/mm-extern.el index c574bd615..f4c728541 100644 --- a/lisp/mm-extern.el +++ b/lisp/mm-extern.el @@ -97,7 +97,7 @@ (subject (or (cdr (assq 'subject params)) "none")) (buf (current-buffer)) info) - (if (y-or-n-p (format "Send a request message to %s?" server)) + (if (y-or-n-p (format "Send a request message to %s? " server)) (save-window-excursion (message-mail server subject) (message-goto-body) diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 581289bc0..11b7e8cbd 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -1130,7 +1130,7 @@ FUNC will be called with the group name to determine the article number." (if (and (symbolp nnmail-split-methods) (fboundp nnmail-split-methods)) (let ((split - (condition-case nil + (condition-case error-info ;; `nnmail-split-methods' is a function, so we ;; just call this function here and use the ;; result. @@ -1138,7 +1138,7 @@ FUNC will be called with the group name to determine the article number." '("bogus")) (error (nnheader-message - 5 "Error in `nnmail-split-methods'; using `bogus' mail group") + 5 "Error in `nnmail-split-methods'; using `bogus' mail group: %S" error-info) (sit-for 1) '("bogus"))))) (setq split (mm-delete-duplicates split)) diff --git a/texi/ChangeLog b/texi/ChangeLog index 5b750a507..b7951ab2a 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2006-07-24 Richard Stallman + + * pgg.texi: Move periods and commas inside quotes. + 2006-07-28 Katsumi Yamaoka * gnus.texi (Oort Gnus): Mention that the Lisp files are now installed diff --git a/texi/pgg.texi b/texi/pgg.texi index 026d225c7..e02eef710 100644 --- a/texi/pgg.texi +++ b/texi/pgg.texi @@ -17,7 +17,7 @@ under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +Free Documentation License.'' @end quotation @end copying -- 2.34.1