Remove nnregistry refer method auto-install and update docs.

* gnus-registry.el: Update docs to mention nnregistry.el.
(gnus-registry-initialize): Don't install nnregistry refer method
automatically.
(gnus-registry-install-nnregistry): Remove it.

* nnregistry.el: Update docs to mention manual.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ddd2073..e41f763 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-08  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * nnregistry.el: Update docs to mention manual.
+
+       * gnus-registry.el: Update docs to mention nnregistry.el.
+       (gnus-registry-initialize): Don't install nnregistry refer method
+       automatically.
+       (gnus-registry-install-nnregistry): Remove it.
+
 2010-10-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * shr.el (shr-insert): Don't insert double spaces.

diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index 45fa956..6c2233f 100644 (file)
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -36,17 +36,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
@@ -1131,8 +1132,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 +1148,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)

diff --git a/lisp/nnregistry.el b/lisp/nnregistry.el
index b2d8050..03ff5e7 100644 (file)
--- a/lisp/nnregistry.el
+++ b/lisp/nnregistry.el
@@ -25,7 +25,8 @@
 
 ;; This file provides the `nnregistry' Gnus back-end.  It can be used
 ;; in `gnus-refer-article-method' to quickly search for a message by
-;; id, regardless of the back-end that stores it.
+;; id, regardless of the back-end that stores it.  See the Gnus manual
+;; for usage examples and more information.
 
 ;;; Code: