From ea6a0d9c73a37052c4f5dac9bfd740697b395d5c Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 9 Sep 2016 09:00:00 +0200 Subject: [PATCH] Better error-checking for doom|set-selected-window --- core/core-modeline.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/core-modeline.el b/core/core-modeline.el index 3a4456cd3..14f02ad8e 100644 --- a/core/core-modeline.el +++ b/core/core-modeline.el @@ -117,7 +117,8 @@ first time." (defvar mode-line-selected-window nil) (defun doom|set-selected-window (&rest _) (let ((window (frame-selected-window))) - (unless (minibuffer-window-active-p window) + (when (and (windowp window) + (not (minibuffer-window-active-p window))) (setq mode-line-selected-window window)))) (add-hook 'window-configuration-change-hook #'doom|set-selected-window) (add-hook 'focus-in-hook #'doom|set-selected-window)