changeset 106364:2f2ce7005c10

(gnus-group-prepare-flat): Check also whether groups with no unread article should be listed if the 2nd arg `predicate' is given.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 02 Dec 2009 00:48:21 +0000
parents cb52c961cfa5
children 06698b91c779
files lisp/gnus/ChangeLog lisp/gnus/gnus-group.el
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Tue Dec 01 20:44:21 2009 +0000
+++ b/lisp/gnus/ChangeLog	Wed Dec 02 00:48:21 2009 +0000
@@ -1,3 +1,9 @@
+2009-12-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* 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-29  Juri Linkov  <juri@jurta.org>
 
 	* gnus-sum.el (gnus-recenter): Use `recenter-top-bottom'
--- a/lisp/gnus/gnus-group.el	Tue Dec 01 20:44:21 2009 +0000
+++ b/lisp/gnus/gnus-group.el	Wed Dec 02 00:48:21 2009 +0000
@@ -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))))