From 0b350f6ea441a094a7454e7f00ae17387d834faf Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 8 Sep 2018 23:27:18 -0400 Subject: [PATCH] ui/popup: refactor +popup/raise Improves its error tolerance and gives it a window argument. --- modules/ui/popup/autoload/popup.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/ui/popup/autoload/popup.el b/modules/ui/popup/autoload/popup.el index dc2a036eb..a526c45fa 100644 --- a/modules/ui/popup/autoload/popup.el +++ b/modules/ui/popup/autoload/popup.el @@ -75,7 +75,7 @@ the buffer is visible, then set another timer and try again later." "Called in lieu of `delete-other-windows' in popup windows. Raises WINDOW (assumed to be a popup), then deletes other windows." - (when-let* ((window (+popup/raise))) + (when-let* ((window (+popup/raise window))) (delete-other-windows window)) nil) @@ -379,13 +379,13 @@ the message buffer in a popup window." t) ;;;###autoload -(defun +popup/raise () +(defun +popup/raise (window) "Raise the current popup window into a regular window." - (interactive) - (unless (+popup-window-p) + (interactive (list (selected-window))) + (cl-check-type window window) + (unless (+popup-window-p window) (user-error "Cannot raise a non-popup window")) - (let ((window (selected-window)) - (buffer (current-buffer)) + (let ((buffer (current-buffer)) +popup--remember-last) (set-window-parameter window 'ttl nil) (+popup/close window 'force)