[gnus git] branch master updated: n0-15-88-gad9900e =1= Minor fix for the case where `gnus-registry-ignored-groups' is a list of lists.

       via  ad9900e232b5f19b73c0033cc334f33cd2624250 (commit)
      from  ef9104456fa7e844c795c4bf130c4b8c97cc34b9 (commit)


- Log -----------------------------------------------------------------
commit ad9900e232b5f19b73c0033cc334f33cd2624250
Author: Ted Zlatanov <[email protected]>
Date:   Fri Apr 22 08:20:27 2011 -0500

    Minor fix for the case where `gnus-registry-ignored-groups' is a list of lists.
    
    * 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 04fa72f..3d60e76 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2011-04-22  Teodor Zlatanov  <[email protected]>
 
+	* 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  <[email protected]>
+
 	* 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-registry.el b/lisp/gnus-registry.el
index f0b1f18..3597cbc 100644
--- a/lisp/gnus-registry.el
+++ b/lisp/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))))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog        |    6 ++++++
 lisp/gnus-registry.el |    8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project