emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 7c47d6c52d 18/25: Register erc-kill-buffer-function locally


From: F. Jason Park
Subject: master 7c47d6c52d 18/25: Register erc-kill-buffer-function locally
Date: Thu, 30 Jun 2022 18:29:54 -0400 (EDT)

branch: master
commit 7c47d6c52d70225334444947824b40ad9f593c31
Author: F. Jason Park <jp@neverwas.me>
Commit: F. Jason Park <jp@neverwas.me>

    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 18a353ae49..cbb0c9f4b4 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'."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]