From: yamaoka <yamaoka>
Date: Thu, 15 Apr 2004 06:43:13 +0000 (+0000)
Subject: Synch to No Gnus 200404150642.
X-Git-Tag: t-gnus-6_17_4-quimby-~970
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8c0396ef3a1a3a65bccfa2a48b8998621978532;p=elisp%2Fgnus.git-

Synch to No Gnus 200404150642.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0495abf..7c07bec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* nnmail.el (nnmail-cache-insert): Revert last change.
+
 2004-04-14  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* nnmail.el (nnmail-cache-insert): Always check whether
diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index e71afe7..1949e6e 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, 2004
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -1569,16 +1569,15 @@ 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)))
+	(if (and grp (not (string= "" grp))
+		 (gnus-methods-equal-p gnus-command-method
+				       (nnmail-cache-primary-mail-backend)))
 	    (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))
-		(if (gnus-methods-equal-p gnus-command-method
-					  (nnmail-cache-primary-mail-backend))
-		    (insert id "\t" grp "\n")
-		  (insert id "\n"))))
+		(insert id "\t" grp "\n")))
 	  (insert id "\n"))))))
   
 (defun nnmail-cache-primary-mail-backend ()