(gnus-group-prepare-flat): Check also whether groups with no unread article

 should be listed if the 2nd arg `predicate' is given.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ff3d7e3ce1337c2cecd728a92b46be8033d8fede..23fa5f7e828a40d5338249573d7998de5bce4bb6 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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'

diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 4a7f06833a3b1090f9634638259c04b3c4392d54..7b3296ad1cb7e354bfa84669e1c7f739278bb76f 100644 (file)
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1372,7 +1372,8 @@ if it is a string, only list groups matching REGEXP."
          (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 it is a string, only list groups matching REGEXP."
                       (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))))