From 74db886b06e4577e5f69859c5ad590c86bc1d964 Mon Sep 17 00:00:00 2001 From: Teodor Zlatanov Date: Sat, 23 Apr 2011 00:08:28 +0000 Subject: [PATCH] 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. --- lisp/gnus/ChangeLog | 6 ++++++ lisp/gnus/gnus-registry.el | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 4a8311f6e0a..013f5392e02 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,11 @@ 2011-04-22 Teodor Zlatanov + * 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 + * 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 f0b1f186541..3597cbc1584 100644 --- 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)))) -- 2.11.4.GIT