From 7c47d6c52d70225334444947824b40ad9f593c31 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Wed, 27 Oct 2021 21:13:24 -0700 Subject: [PATCH] Register erc-kill-buffer-function locally * lisp/erc/erc.el (erc-kill-buffer-function): Don't add hook when loading file. Move to major-mode setup and make buffer-local instead. Depends on tests in bug#48598. --- lisp/erc/erc.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 18a353ae494..cbb0c9f4b4d 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1591,6 +1591,7 @@ Defaults to the server buffer." (setq-local paragraph-start (concat "\\(" (regexp-quote (erc-prompt)) "\\)")) (setq-local completion-ignore-case t) + (add-hook 'kill-buffer-hook #'erc-kill-buffer-function nil t) (add-hook 'completion-at-point-functions #'erc-complete-word-at-point nil t)) ;; activation @@ -7111,9 +7112,6 @@ See also `format-spec'." ;;; Various hook functions -;; FIXME: Don't set the hook globally! -(add-hook 'kill-buffer-hook #'erc-kill-buffer-function) - (defcustom erc-kill-server-hook '(erc-kill-server erc-networks-shrink-ids-and-buffer-names) "Invoked whenever a live server buffer is killed via `kill-buffer'." -- 2.39.5