From f6b96c6e79978f3f3bbd4205ccc3c863809e2122 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 20 Feb 2017 00:10:34 -0500 Subject: [PATCH] Refactor doom/popup-toggle --- core/autoload/popups.el | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/core/autoload/popups.el b/core/autoload/popups.el index e26e0b28b..d109f9711 100644 --- a/core/autoload/popups.el +++ b/core/autoload/popups.el @@ -50,17 +50,16 @@ possible rules." (setq doom-popup-history '())) ;;;###autoload -(defun doom/popup-restore-or-switch () +(defun doom/popup-toggle () + "Toggle popups." (interactive) - (let (popups) - (cond ((doom-popup-p) - (unless (doom-visible-windows) - (user-error "No non-popups available")) - (other-window 1)) - ((setq popups (doom-popup-windows)) - (select-window (car popups))) - (t - (doom/popup-restore))))) + (when (doom-popup-p) + (if doom-popup-other-window + (select-window doom-popup-other-window) + (other-window 1))) + (if (doom-popup-windows) + (doom/popup-close-all) + (doom/popup-restore))) ;;;###autoload (defun doom/popup-close (&optional window)