From b2f27c2b4fcb595f68dd3a1bf51a06c4af3acc29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Larsson?= Date: Sun, 10 Oct 2021 18:22:13 +0200 Subject: [PATCH] refactor(lookup): move xwidget popup rule (#5598) Setting the rules explicitly was preventing users from customizing how xwidget popups should behave, so it was moved to the popup module as a global default. --- modules/tools/lookup/autoload/xwidget.el | 3 +-- modules/ui/popup/config.el | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/tools/lookup/autoload/xwidget.el b/modules/tools/lookup/autoload/xwidget.el index 90cb6d26a..fb8603a32 100644 --- a/modules/tools/lookup/autoload/xwidget.el +++ b/modules/tools/lookup/autoload/xwidget.el @@ -14,7 +14,6 @@ (setq xwidget-webkit-last-session-buffer +lookup--xwidget-webkit-last-session-buffer) (save-window-excursion (xwidget-webkit-browse-url url new-session)) - (with-popup-rules! '(("^\\*xwidget" :vslot -11 :size 0.35 :select nil)) - (pop-to-buffer xwidget-webkit-last-session-buffer)) + (pop-to-buffer xwidget-webkit-last-session-buffer) (setq +lookup--xwidget-webkit-last-session-buffer xwidget-webkit-last-session-buffer xwidget-webkit-last-session-buffer orig-last-session-buffer)))) diff --git a/modules/ui/popup/config.el b/modules/ui/popup/config.el index 27504302e..09ad19234 100644 --- a/modules/ui/popup/config.el +++ b/modules/ui/popup/config.el @@ -155,6 +155,8 @@ prevent the popup(s) from messing up the UI (or vice versa)." :slot 2 :vslot -8 :size 0.35 :select t) ("^\\*eww\\*" ; `eww' (and used by dash docsets) :vslot -11 :size 0.35 :select t) + ("^\\*xwidget" + :vslot -11 :size 0.35 :select nil) ("^\\*info\\*$" ; `Info-mode' :slot 2 :vslot 2 :size 0.45 :select t))) '(("^\\*Warnings" :vslot 99 :size 0.25)