From 10eeba90f2bf1c9065ccd88fb1806a82d6bde61c Mon Sep 17 00:00:00 2001 From: Ted Zlatanov Date: Thu, 21 Apr 2011 11:34:34 -0500 Subject: [PATCH] Further registry ignored-groups fixes. * gnus.el (gnus-registry-ignored-groups): Provide default in gnus.el, not gnus-registry.el. * gnus-registry.el (gnus-registry-ignored-groups): Remove defcustom. Explain why in comments. --- lisp/ChangeLog | 6 ++++++ lisp/gnus-registry.el | 20 +++++++------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cff9d06ad..bc0e77636 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2011-04-21 Teodor Zlatanov + * gnus-registry.el (gnus-registry-ignored-groups): Remove defcustom. + Explain why in comments. + + * gnus.el (gnus-registry-ignored-groups): Provide default in gnus.el, + not gnus-registry.el. + * gnus-registry.el (gnus-registry-ignored-groups): Adjust defaults to match the parameter. (gnus-registry-ignore-group-p): Adjust to take either a group/topic diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el index 672ef9ccc..306f29d09 100644 --- a/lisp/gnus-registry.el +++ b/lisp/gnus-registry.el @@ -137,18 +137,6 @@ nnmairix groups are specifically excluded because they are ephemeral." :group 'gnus-registry :type '(repeat regexp)) -(defcustom gnus-registry-ignored-groups - (mapcar (lambda (g) (list g t)) - '("delayed$" "drafts$" "queue$" "INBOX$" "^nnmairix:" "archive")) - "List of groups that the Gnus Registry will ignore. -The group names are matched, they don't have to be fully -qualified. - -nnmairix groups are specifically excluded because they are ephemeral." - :group 'gnus-registry - :type '(repeat (list regexp (choice (const :tag "Do not ignore" nil) - (const :tag "Ignore" t))))) - (defcustom gnus-registry-install 'ask "Whether the registry should be installed." :group 'gnus-registry @@ -657,12 +645,18 @@ Consults `gnus-registry-unfollowed-groups' and group nnmail-split-fancy-with-parent-ignore-groups))))) +;; note that gnus-registry-ignored-groups is defined in gnus.el as a +;; group/topic parameter and an associated variable! + +;; we do special logic for ignoring to accept regular expressions and +;; nnmail-split-fancy-with-parent-ignore-groups as well (defun gnus-registry-ignore-group-p (group) "Determines if a group name should be ignored. Consults `gnus-registry-ignored-groups' and `nnmail-split-fancy-with-parent-ignore-groups'." (and group - (or (gnus-grep-in-list + (or (gnus-parameter-registry-ignore group) + (gnus-grep-in-list group (delq nil (mapcar (lambda (g) (cond -- 2.25.1