procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nnir.el (nnir-mode): Don't install registry hooks if user hasn't installed the registry.

Browse source
This commit is contained in:
Andrew Cohen 2010-12-14 12:52:30 +00:00 • committed by Katsumi Yamaoka
parent ab274982aa
commit 27625a584c
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/gnus/ChangeLog
View file

@ -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

17
lisp/gnus/nnir.el
View file

@ -289,7 +289,9 @@ is `(valuefunc member)'."
(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 @@ server is of form 'backend:name'."
(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))))