From 9a1bf420751f257c7716fa6e051e55930821a0af Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 1 Mar 2018 23:41:43 -0500 Subject: [PATCH] feature/popup: remove eval-when-compile This fixes void-variable errors when byte-compiling this module. --- modules/feature/popup/config.el | 40 +++++++++++++++------------------ 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/modules/feature/popup/config.el b/modules/feature/popup/config.el index 92486bb16..bbf578190 100644 --- a/modules/feature/popup/config.el +++ b/modules/feature/popup/config.el @@ -145,29 +145,25 @@ ALIST supports one custom parameter: `size', which will resolve to ;; Default popup rules & bootstrap ;; -(eval-when-compile - (when (featurep! +all) - (set! :popup "^ \\*" '((slot . 1) (vslot . -1) (size . +popup-shrink-to-fit))) - (set! :popup "^\\*" '((slot . 1) (vslot . -1)) '((select . t)))) +(when (featurep! +all) + (set! :popup "^ \\*" '((slot . 1) (vslot . -1) (size . +popup-shrink-to-fit))) + (set! :popup "^\\*" '((slot . 1) (vslot . -1)) '((select . t)))) - (when (featurep! +defaults) - (set! :popup "^\\*Completions" '((slot . -1) (vslot . -2)) '((transient . 0))) - (set! :popup "^\\*Compil\\(ation\\|e-Log\\)" nil '((transient . 0) (quit . t))) - (set! :popup "^\\*\\(?:scratch\\|Messages\\)" nil '((transient))) - (set! :popup "^\\*[Hh]elp" - '((slot . 2) (vslot . 2) (size . 0.2)) - '((select . t))) - (set! :popup "^\\*doom \\(?:term\\|eshell\\)" - '((size . 0.25)) - '((quit) (transient . 0))) - (set! :popup "^\\*doom:" - '((size . 0.35) (side . bottom)) - '((select . t) (modeline . t) (quit) (transient . t))) - (set! :popup "^\\*\\(?:\\(?:Pp E\\|doom e\\)val\\)" - '((size . +popup-shrink-to-fit)) '((transient . 0) (select . ignore)))) - nil) - -(setq +popup--display-buffer-alist (eval-when-compile +popup--display-buffer-alist)) +(when (featurep! +defaults) + (set! :popup "^\\*Completions" '((slot . -1) (vslot . -2)) '((transient . 0))) + (set! :popup "^\\*Compil\\(ation\\|e-Log\\)" nil '((transient . 0) (quit . t))) + (set! :popup "^\\*\\(?:scratch\\|Messages\\)" nil '((transient))) + (set! :popup "^\\*[Hh]elp" + '((slot . 2) (vslot . 2) (size . 0.2)) + '((select . t))) + (set! :popup "^\\*doom \\(?:term\\|eshell\\)" + '((size . 0.25)) + '((quit) (transient . 0))) + (set! :popup "^\\*doom:" + '((size . 0.35) (side . bottom)) + '((select . t) (modeline . t) (quit) (transient . t))) + (set! :popup "^\\*\\(?:\\(?:Pp E\\|doom e\\)val\\)" + '((size . +popup-shrink-to-fit)) '((transient . 0) (select . ignore)))) (add-hook 'doom-init-ui-hook #'+popup-mode) (add-hook! '+popup-buffer-mode-hook #'(+popup|adjust-fringes +popup|set-modeline))