gnus-registry.el (gnus-registry-ignore-group-p): Test specifically for the case where...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4a8311f6e0a559930f696db516a21aa309262f95..013f5392e023552cbd36f09092ce264445294e5a 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,11 @@
 2011-04-22  Teodor Zlatanov  <tzz@lifelogs.com>
 
+       * gnus-registry.el (gnus-registry-ignore-group-p): Test specifically
+       for the case where `gnus-registry-ignored-groups' is a list of lists,
+       and don't call `gnus-parameter-registry-ignore' otherwise.
+
+2011-04-21  Teodor Zlatanov  <tzz@lifelogs.com>
+
        * nnimap.el (nnimap-user): New backend variable.
        (nnimap-open-connection-1): Use it.
        (nnimap-credentials): Accept user parameter so it's explicit what user

diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index f0b1f18654180210874efdb976b76e8af408dde9..3597cbc15845cee4db405784243b6b036a82c60c 100644 (file)
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -666,8 +666,7 @@ Consults `gnus-registry-unfollowed-groups' and
 Consults `gnus-registry-ignored-groups' and
 `nnmail-split-fancy-with-parent-ignore-groups'."
   (and group
-       (or (gnus-parameter-registry-ignore group)
-           (gnus-grep-in-list
+       (or (gnus-grep-in-list
             group
             (delq nil (mapcar (lambda (g)
                                 (cond
@@ -675,6 +674,11 @@ Consults `gnus-registry-ignored-groups' and
                                  ((and (listp g) (nth 1 g))
                                   (nth 0 g))
                                  (t nil))) gnus-registry-ignored-groups)))
+           ;; only use `gnus-parameter-registry-ignore' if
+           ;; `gnus-registry-ignored-groups' is a list of lists
+           ;; (it can be a list of regexes)
+           (and (listp (nth 0 gnus-registry-ignored-groups))
+                (gnus-parameter-registry-ignore group))
            (gnus-grep-in-list
             group
             nnmail-split-fancy-with-parent-ignore-groups))))