Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d87788f..135052f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-07  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * nnmail.el (nnmail-cache-insert): Prefer group-art over group
+       when intuiting the group the message is written to.  From Josh
+       Huber <huber@alum.wpi.edu>.
+
 2002-05-06  Simon Josefsson  <jas@extundo.com>
 
        * gnus-topic.el (gnus-group-topic-parameters): Work when group

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index a98a187..07c2f79 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1470,13 +1470,13 @@ See the documentation for the variable `nnmail-split-fancy' for documentation."
     (let ((g nil))
       (cond (grp
             (setq g grp))
+           ((and (boundp 'group-art) group-art (listp group-art))
+            (setq g (caar group-art)))
            ((and (boundp 'group) group)
             (setq g group))
            ((and (boundp 'group-art-list) group-art-list
                  (listp group-art-list))
             (setq g (caar group-art-list)))
-           ((and (boundp 'group-art) group-art (listp group-art))
-            (setq g (caar group-art)))
            (t (setq g "")))
       (unless (gnus-buffer-live-p nnmail-cache-buffer)
        (nnmail-cache-open))