From 51084852a6a3f74fdfcb0cd38bbbadfc1e9deed7 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 7 Jan 2018 06:24:56 -0500 Subject: [PATCH] Revert "feature/popup: use window-toggle-side-window" #298 This reverts commit 29e25f5ea8ed9fc665937bb87edaadf1531456e7. window-toggle-side-window isn't as robust as I had hoped. --- modules/feature/popup/autoload.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/feature/popup/autoload.el b/modules/feature/popup/autoload.el index dd8385289..f7a358f8f 100644 --- a/modules/feature/popup/autoload.el +++ b/modules/feature/popup/autoload.el @@ -302,9 +302,10 @@ This window parameter is ignored if FORCE-P is non-nil." "If popups are open, close them. If they aren't, restore the last one or open the message buffer in a popup window." (interactive) - (condition-case _ - (window-toggle-side-windows) - ('error (display-buffer (get-buffer "*Messages*"))))) + (cond ((+popup-windows) + (+popup/close-all t)) + ((ignore-errors (+popup/restore))) + ((display-buffer (get-buffer "*Messages*"))))) ;;;###autoload (defun +popup/restore ()