emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

core-popups: make doom*popup-init more robust (fixes bufferp errors)

Browse source
This commit is contained in:
Henrik Lissner 2017-03-04 18:01:58 -05:00
parent 790e9037fe
commit 05e1a15ba8
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/core-popups.el
View file

@ -168,8 +168,10 @@ and setting `doom-popup-rules' within it. Returns the window."
(unless (doom-popup-p) (unless (doom-popup-p)
(setq doom-popup-other-window (selected-window))) (setq doom-popup-other-window (selected-window)))
(let ((plist (or (nth 2 args) (let ((plist (or (nth 2 args)
(and (bufferp (car args)) (cond ((windowp (car args))
(shackle-match (window-buffer (car args)))))) (shackle-match (window-buffer (car args))))
((bufferp (car args))
(shackle-match (car args))))))
(window (apply orig-fn args))) (window (apply orig-fn args)))
(unless window (unless window
(error "No popup window was found for %s: %s" (car args) plist)) (error "No popup window was found for %s: %s" (car args) plist))