Changes committed gnus/lisp (ChangeLog gnus-group.el)

Modified: ChangeLog gnus-group.el

(gnus-group-prepare-flat): Check also whether groups with no unread article
 should be listed if the 2nd arg `predicate' is given.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.2039 gnus/lisp/ChangeLog:7.2040
--- ChangeLog:7.2039	Mon Nov 30 19:25:10 2009
+++ ChangeLog	Wed Dec  2 01:49:30 2009
@@ -1,3 +1,9 @@
+2009-12-02  Katsumi Yamaoka  <[email protected]>
+
+	* gnus-group.el (gnus-group-prepare-flat): Check also whether groups
+	with no unread article should be listed if the 2nd arg `predicate' is
+	given.
+
 2009-11-30  Katsumi Yamaoka  <[email protected]>
 
 	* lpath.el: Fbind recenter-top-bottom for Emacs 21, 22, and (S)XEmacs.
Index: gnus-group.el
diff -u gnus/lisp/gnus-group.el:7.119 gnus/lisp/gnus-group.el:7.120
--- gnus-group.el:7.119	Wed Aug 12 10:27:50 2009
+++ gnus-group.el	Wed Dec  2 01:49:30 2009
@@ -1372,7 +1372,8 @@
 	  (setq not-in-list (delete group not-in-list)))
 	(when (gnus-group-prepare-logic
 	       group
-	       (and unread		; This group might be unchecked
+	       (and (or unread		; This group might be unchecked
+			predicate)	; Check if this group should be listed
 		    (or (not (stringp regexp))
 			(string-match regexp group))
 		    (<= (setq clevel (gnus-info-level info)) level)
@@ -1386,7 +1387,7 @@
 		       (if (eq unread t) ; Unactivated?
 			   gnus-group-list-inactive-groups
 					; We list unactivated
-			 (> unread 0))
+			 (and (numberp unread) (> unread 0)))
 					; We list groups with unread articles
 		       (and gnus-list-groups-with-ticked-articles
 			    (cdr (assq 'tick (gnus-info-marks info))))