Synch to Gnus 200310162306.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1eb7b97..a9b33db 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnmail.el (nnmail-article-group): Default to "bogus".
+
+       * mail-source.el (mail-source-delete-incoming): Change to nil.
+
 2003-10-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mail-source.el (mail-source-fetch-imap): Fix mismatched parens.

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index de0a785..64cc4fd 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -261,7 +261,7 @@ If non-nil, this maildrop will be checked periodically for new mail."
   :group 'mail-source
   :type 'integer)
 
-(defcustom mail-source-delete-incoming t
+(defcustom mail-source-delete-incoming nil
   "*If non-nil, delete incoming files after handling.
 If t, delete immediately, if nil, never delete.  If a positive number, delete
 files older than number of days."

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index dde7ff9..5fa97b3 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1106,7 +1106,10 @@ FUNC will be called with the group name to determine the article number."
              (unless group-art
                (setq group-art
                      (list (cons (car method)
-                                 (funcall func (car method)))))))))
+                                 (funcall func (car method))))))))
+         ;; Fall back on "bogus" if all else fails.
+         (unless group-art
+           (setq group-art (list (cons "bogus" (funcall func "bogus"))))))
        ;; Produce a trace if non-empty.
        (when (and trace nnmail-split-trace)
          (let ((restore (current-buffer)))