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  <romain@orebokech.com>

   * lisp/mm-extern.el (mm-extern-mail-server): End `y-or-n-p' prompt with a
   space.

2006-07-18  Karl Fogel  <kfogel@red-bean.com>

   * 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  <rms@gnu.org>

   * texi/pgg.texi: Move periods and commas inside quotes.

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0d93471..b638cd3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-13  Romain Francoise  <romain@orebokech.com>
+
+       * mm-extern.el (mm-extern-mail-server): End `y-or-n-p' prompt with a
+       space.
+
 2006-08-09  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * 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  <kfogel@red-bean.com>
+
+       * 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  <Reiner.Steib@gmx.de>
 
        * gnus-sum.el (gnus-summary-delete-article): Don't use TAB in doc
@@ -506,8 +517,7 @@
 
 2006-05-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-       * 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  <Reiner.Steib@gmx.de>
 
-       * 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  <yamaoka@jpl.org>
 
-       * 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  <Reiner.Steib@gmx.de>
 
@@ -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
-       <rwnewsmampfer@geekmail.de>.
+       intangible text.
+       Reported by Ralf Wachinger <rwnewsmampfer@geekmail.de>.
 
 2006-03-14  Reiner Steib  <Reiner.Steib@gmx.de>
 
@@ -1262,8 +1272,8 @@
 2006-03-14  Simon Josefsson  <jas@extundo.com>
 
        * message.el (message-unique-id): Don't use message-number-base36
-       if (user-uid) is a float.  Reported by Bjorn Solberg
-       <bjorn_ding1@hekneby.org>.
+       if (user-uid) is a float.
+       Reported by Bjorn Solberg <bjorn_ding1@hekneby.org>.
 
 2006-03-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 

diff --git a/lisp/mm-extern.el b/lisp/mm-extern.el
index c574bd6..f4c7285 100644 (file)
--- 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 581289b..11b7e8c 100644 (file)
--- 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 5b750a5..b7951ab 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-24  Richard Stallman  <rms@gnu.org>
+
+       * pgg.texi: Move periods and commas inside quotes.
+
 2006-07-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus.texi (Oort Gnus): Mention that the Lisp files are now installed

diff --git a/texi/pgg.texi b/texi/pgg.texi
index 026d225..e02eef7 100644 (file)
--- 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