From 4c18fc81af3289b4d4cebe36ddd3503a6b895734 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 13 Aug 2018 18:21:07 +0200 Subject: [PATCH] Ensure switch hooks don't reference dead buffers --- core/core-ui.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/core-ui.el b/core/core-ui.el index 9d8752713..34c22b0a6 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -315,8 +315,9 @@ from the default." (let ((doom-inhibit-switch-buffer-hooks t)) (run-hooks 'doom-exit-buffer-hook) (prog1 (apply orig-fn buffer-or-name args) - (with-current-buffer buffer-or-name - (run-hooks 'doom-enter-buffer-hook)))))) + (when (buffer-live-p (get-buffer buffer-or-name)) + (with-current-buffer buffer-or-name + (run-hooks 'doom-enter-buffer-hook))))))) (defun doom|init-custom-hooks (&optional disable) (dolist (spec '((select-window . doom*switch-window-hooks)