From: yamaoka <yamaoka>
Date: Wed, 14 Apr 2004 07:25:35 +0000 (+0000)
Subject: Synch to No Gnus 200404140725.
X-Git-Tag: t-gnus-6_17_4-quimby-~972
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=d67dfa9bb65727f5e0552fe5013bbaa02d7a1b4e;p=elisp%2Fgnus.git-

Synch to No Gnus 200404140725.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ca1bb2..0495abf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* nnmail.el (nnmail-cache-insert): Always check whether
+	nnmail-cache-ignore-groups matches a group name.
+
 2004-04-13  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* spam.el (spam-fetch-field-fast, spam-generate-fake-headers)
diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 1949e6e..e71afe7 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1,5 +1,5 @@
 ;;; nnmail.el --- mail support functions for the Gnus mail backends
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -1569,15 +1569,16 @@ See the documentation for the variable `nnmail-split-fancy' for details."
       (save-excursion
 	(set-buffer nnmail-cache-buffer)
 	(goto-char (point-max))
-	(if (and grp (not (string= "" grp))
-		 (gnus-methods-equal-p gnus-command-method
-				       (nnmail-cache-primary-mail-backend)))
+	(if (and grp (not (string= "" grp)))
 	    (let ((regexp (if (consp nnmail-cache-ignore-groups)
 			      (mapconcat 'identity nnmail-cache-ignore-groups
 					 "\\|")
 			    nnmail-cache-ignore-groups)))
 	      (unless (and regexp (string-match regexp grp))
-		(insert id "\t" grp "\n")))
+		(if (gnus-methods-equal-p gnus-command-method
+					  (nnmail-cache-primary-mail-backend))
+		    (insert id "\t" grp "\n")
+		  (insert id "\n"))))
 	  (insert id "\n"))))))
   
 (defun nnmail-cache-primary-mail-backend ()