From e8d7e3a59a05917b94b6803c123be97ccd693f0d Mon Sep 17 00:00:00 2001 From: Eric Abrahamsen Date: Wed, 28 Nov 2018 09:31:40 -0800 Subject: [PATCH] Further small tweaks to Gnus modes cleanup * lisp/gnus/gnus-sum.el: Remove explicit definition of `gnus-summary-mode-hook', this is now created automatically. * lisp/gnus/nnir.el (nnir-open-server): Attach `nnir-mode' to the `gnus-summary-prepared-hook', instead of `gnus-summary-mode-hook'. The latter no longer has access to the buffer-local value of `gnus-newsgroup-name', which `nnir-mode' needs. --- lisp/gnus/gnus-sum.el | 7 ------- lisp/gnus/nnir.el | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 7be52717de9..4baf4bc8263 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -946,13 +946,6 @@ This variable is local to the summary buffers." :type '(choice (const :tag "off" nil) integer)) -(defcustom gnus-summary-mode-hook nil - "A hook for Gnus summary mode. -This hook is run before any variables are set in the summary buffer." - :options '(turn-on-gnus-mailing-list-mode gnus-pick-mode) - :group 'gnus-summary-various - :type 'hook) - (defcustom gnus-summary-menu-hook nil "Hook run after the creation of the summary mode menu." :group 'gnus-summary-visual diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 084b154e8a1..62ac5048641 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -657,7 +657,7 @@ skips all prompting." (let ((backend (car (gnus-server-to-method server)))) (if backend (nnoo-change-server backend server definitions) - (add-hook 'gnus-summary-mode-hook 'nnir-mode) + (add-hook 'gnus-summary-prepared-hook 'nnir-mode) (nnoo-change-server 'nnir server definitions)))) (deffoo nnir-request-group (group &optional server dont-check _info) -- 2.39.5