From: F. Jason Park <jp@neverwas.me>
Date: Thu, 28 Oct 2021 04:13:24 +0000 (-0700)
Subject: Register erc-kill-buffer-function locally
X-Git-Tag: emacs-29.0.90~1447^2~1324
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7c47d6c52d70225334444947824b40ad9f593c31;p=emacs.git

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

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'."