[gnus git] branch master updated: n0-15-83-g10eeba9 =1= Further registry ignored-groups fixes.

       via  10eeba90f2bf1c9065ccd88fb1806a82d6bde61c (commit)
      from  33cae6a34818350f826ad9015e4fd2518064c88a (commit)


- Log -----------------------------------------------------------------
commit 10eeba90f2bf1c9065ccd88fb1806a82d6bde61c
Author: Ted Zlatanov <[email protected]>
Date:   Thu Apr 21 11:34:34 2011 -0500

    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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cff9d06..bc0e776 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2011-04-21  Teodor Zlatanov  <[email protected]>
 
+	* 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 672ef9c..306f29d 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

-----------------------------------------------------------------------
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 |   20 +++++++-------------
 2 files changed, 13 insertions(+), 13 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