(article-transform-date): Fix infinite recursion.

[gnus] / lisp / gnus-registry.el

diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index 45fa956..cef173c 100644 (file)
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -1,7 +1,6 @@
 ;;; gnus-registry.el --- article registry for Gnus
 
-;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;; Free Software Foundation, Inc.
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
 
 ;; Author: Ted Zlatanov <tzz@lifelogs.com>
 ;; Keywords: news registry
@@ -36,17 +35,18 @@
 
 ;; Put this in your startup file (~/.gnus.el for instance)
 
-;; (require 'nnregistry) ;; optional, or see below (automatically calls `gnus-registry-install-nnregistry' when `gnus-registry-initialize' is called)
 ;; (setq gnus-registry-max-entries 2500
 ;;       gnus-registry-use-long-group-names t)
 
 ;; (gnus-registry-initialize)
-;; (gnus-registry-install-nnregistry) ;; optional, or see above (loading nnregistry makes it unnecessary)
 
 ;; Then use this in your fancy-split:
 
 ;; (: gnus-registry-split-fancy-with-parent)
 
+;; You should also consider using the nnregistry backend to look up
+;; articles.  See the Gnus manual for more information.
+
 ;; TODO:
 
 ;; - get the correct group on spool actions
@@ -550,8 +550,9 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
                            key
                            gnus-registry-max-track-groups)))
               (dolist (group groups)
-                (push group found-full)
-                (setq found (append (list group) (delete group found)))))
+                (when (and group (gnus-registry-follow-group-p group))
+                  (push group found-full)
+                  (setq found (append (list group) (delete group found))))))
             (push key matches)
             (gnus-message
              ;; raise level of messaging if gnus-registry-track-extra
@@ -579,8 +580,9 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
                            key
                            gnus-registry-max-track-groups)))
               (dolist (group groups)
-                (push group found-full)
-                (setq found (append (list group) (delete group found)))))
+                (when (and group (gnus-registry-follow-group-p group))
+                  (push group found-full)
+                  (setq found (append (list group) (delete group found))))))
             (push key matches)
             (gnus-message
              ;; raise level of messaging if gnus-registry-track-extra
@@ -1131,8 +1133,6 @@ Returns the first place where the trail finds a group name."
   (setq gnus-registry-install t)       ; in case it was 'ask or nil
   (gnus-registry-install-hooks)
   (gnus-registry-install-shortcuts)
-  (when (featurep 'nnregistry)
-    (gnus-registry-install-nnregistry))
   (gnus-registry-read))
 
 ;;;###autoload
@@ -1149,21 +1149,6 @@ Returns the first place where the trail finds a group name."
 
   (add-hook 'gnus-summary-prepare-hook 'gnus-registry-register-message-ids))
 
-;;;###autoload
-(defun gnus-registry-install-nnregistry ()
-  "Install the nnregistry refer method in `gnus-refer-article-method'."
-  (interactive)
-  (cond ((eq 'nnregistry gnus-refer-article-method))
-       ((null gnus-refer-article-method)
-        (setq gnus-refer-article-method 'nnregistry))
-       ((consp gnus-refer-article-method)
-        (unless (memq 'nnregistry gnus-refer-article-method)
-          (setq gnus-refer-article-method
-                (append gnus-refer-article-method '(nnregistry)))))
-       (t
-        (setq gnus-refer-article-method
-              (list gnus-refer-article-method 'nnregistry)))))
-
 (defun gnus-registry-unload-hook ()
   "Uninstall the registry hooks."
   (interactive)