[Emacs-diffs] /srv/bzr/emacs/trunk r102660: nnir.el (nnir-mode): Don't install registry hooks if user hasn't installed the registry.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 102660
author: Andrew Cohen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2010-12-14 12:52:30 +0000
message:
  nnir.el (nnir-mode): Don't install registry hooks if user hasn't installed 
the registry.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnir.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-12-13 23:31:59 +0000
+++ b/lisp/gnus/ChangeLog       2010-12-14 12:52:30 +0000
@@ -1,3 +1,8 @@
+2010-12-14  Andrew Cohen  <address@hidden>
+
+       * nnir.el (nnir-mode): Don't install registry hooks if user hasn't
+       installed the registry.
+
 2010-12-13  Andrew Cohen  <address@hidden>
 
        * nnir.el (nnir-run-gmane): Better check for gmane groups: error out if

=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el 2010-12-13 23:31:59 +0000
+++ b/lisp/gnus/nnir.el 2010-12-14 12:52:30 +0000
@@ -289,7 +289,9 @@
   (autoload 'nnimap-buffer "nnimap")
   (autoload 'nnimap-command "nnimap")
   (autoload 'nnimap-possibly-change-group "nnimap")
-  (autoload 'gnus-registry-action "gnus-registry"))
+  (autoload 'gnus-registry-action "gnus-registry")
+  (defvar gnus-registry-install))
+
 
 (nnoo-declare nnir)
 (nnoo-define-basics nnir)
@@ -1581,12 +1583,13 @@
   (when (eq (car (gnus-find-method-for-group gnus-newsgroup-name)) 'nnir)
     (setq gnus-summary-line-format
          (or nnir-summary-line-format gnus-summary-line-format))
-    (remove-hook 'gnus-summary-article-delete-hook 'gnus-registry-action t)
-    (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action t)
-    (remove-hook 'gnus-summary-article-expire-hook 'gnus-registry-action t)
-    (add-hook 'gnus-summary-article-delete-hook 'nnir-registry-action t t)
-    (add-hook 'gnus-summary-article-move-hook 'nnir-registry-action t t)
-    (add-hook 'gnus-summary-article-expire-hook 'nnir-registry-action t t)))
+    (when (eq gnus-registry-install t)
+      (remove-hook 'gnus-summary-article-delete-hook 'gnus-registry-action t)
+      (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action t)
+      (remove-hook 'gnus-summary-article-expire-hook 'gnus-registry-action t)
+      (add-hook 'gnus-summary-article-delete-hook 'nnir-registry-action t t)
+      (add-hook 'gnus-summary-article-move-hook 'nnir-registry-action t t)
+      (add-hook 'gnus-summary-article-expire-hook 'nnir-registry-action t t))))