[Emacs-diffs] emacs-25 6ae0aa6: Run erc-kill-channel-hook always on exit

[Lars Ingebrigtsen]

branch: emacs-25
commit 6ae0aa6a504c6023dfe234b507c95f146d668436
Author: Fran Litterio <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Run erc-kill-channel-hook always on exit
    
    * lisp/erc/erc.el (erc-kill-buffer-function): Run erc-kill-channel-hook
    when erc-kill-queries-on-quit is set (bug#21187).
---
 lisp/erc/erc.el |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index a66338d..70e3734 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -6702,7 +6702,7 @@ or `erc-kill-buffer-hook' if any other buffer."
     (cond
      ((eq (erc-server-buffer) (current-buffer))
       (run-hooks 'erc-kill-server-hook))
-     ((erc-channel-p (erc-default-target))
+     ((erc-channel-p (or (erc-default-target) (buffer-name)))
       (run-hooks 'erc-kill-channel-hook))
      (t
       (run-hooks 'erc-kill-buffer-hook)))))