From 05e1a15ba81ad502d5e5ad48a0a5063b94c10b3d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 4 Mar 2017 18:01:58 -0500 Subject: [PATCH] core-popups: make doom*popup-init more robust (fixes bufferp errors) --- core/core-popups.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/core-popups.el b/core/core-popups.el index 2238e6fec..1be55acc4 100644 --- a/core/core-popups.el +++ b/core/core-popups.el @@ -168,8 +168,10 @@ and setting `doom-popup-rules' within it. Returns the window." (unless (doom-popup-p) (setq doom-popup-other-window (selected-window))) (let ((plist (or (nth 2 args) - (and (bufferp (car args)) - (shackle-match (window-buffer (car args)))))) + (cond ((windowp (car args)) + (shackle-match (window-buffer (car args)))) + ((bufferp (car args)) + (shackle-match (car args)))))) (window (apply orig-fn args))) (unless window (error "No popup window was found for %s: %s" (car args) plist))