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

Merge pull request #2145 from dsdshcym/popup/fix-respect-select-nil-when-reuse-window

Browse source 
ui/popup: respect :select nil when reusing a window
This commit is contained in:
Henrik Lissner 2019-12-03 20:01:21 -05:00 • committed by GitHub
commit 2e71bbaa91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/ui/popup/autoload/popup.el
View file

@ -132,6 +132,14 @@ the buffer is visible, then set another timer and try again later."
(let ((ignore-window-parameters t))
(split-window window size side)))
(defun +popup--maybe-select-window (window origin)
"Select a window based on `+popup--inhibit-select' and this window's `select' parameter."
(unless +popup--inhibit-select
(let ((select (+popup-parameter 'select window)))
(if (functionp select)
(funcall select window origin)
(select-window (if select window origin))))))
;;;###autoload
(defun +popup--init (window &optional alist)
"Initializes a popup window. Run any time a popup is opened. It sets the
@ -188,18 +196,13 @@ and enables `+popup-buffer-mode'."
(alist (remove (assq 'window-height alist) alist))
(window (display-buffer-reuse-window buffer alist)))
(when window
(unless +popup--inhibit-select
(select-window window))
(+popup--maybe-select-window window origin)
window))
(when-let (popup (cl-loop for func in actions
if (funcall func buffer alist)
return it))
(+popup--init popup alist)
(unless +popup--inhibit-select
(let ((select (+popup-parameter 'select popup)))
(if (functionp select)
(funcall select popup origin)
(select-window (if select popup origin)))))
(+popup--maybe-select-window popup origin)
popup))))
;;;###autoload