Mercurial > emacs

changeset 111963:44431106d60d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nnir.el (nnir-mode): Don't install registry hooks if user hasn't installed the registry.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 14 Dec 2010 12:52:30 +0000
parents d53efc3630ba
children ec45dfa69a06
files lisp/gnus/ChangeLog lisp/gnus/nnir.el
diffstat 2 files changed, 15 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Tue Dec 14 00:06:18 2010 -0800
+++ b/lisp/gnus/ChangeLog	Tue Dec 14 12:52:30 2010 +0000
@@ -1,3 +1,8 @@
+2010-12-14  Andrew Cohen  <cohen@andy.bu.edu>
+
+	* nnir.el (nnir-mode): Don't install registry hooks if user hasn't
+	installed the registry.
+
 2010-12-13  Andrew Cohen  <cohen@andy.bu.edu>
 
 	* nnir.el (nnir-run-gmane): Better check for gmane groups: error out if
--- a/lisp/gnus/nnir.el	Tue Dec 14 00:06:18 2010 -0800
+++ b/lisp/gnus/nnir.el	Tue Dec 14 12:52:30 2010 +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))))