emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feature/popup: replace +popup-enable-*-rules w/ +all/+defaults flags #394

Browse source
This commit is contained in:
Henrik Lissner 2018-02-01 23:17:18 -05:00
parent 5b19ad50a6
commit e0fd1b9043
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 25 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
init.example.el
View file

@ -30,7 +30,9 @@
(require 'core (concat user-emacs-directory "core/core")) (require 'core (concat user-emacs-directory "core/core"))
(doom! :feature (doom! :feature
popup ; tame sudden yet inevitable temporary windows (popup ; tame sudden yet inevitable temporary windows
+all ; catch all popups that start with an asterix
+defaults) ; default popup rules
;debugger ; FIXME stepping through code, to help you add bugs ;debugger ; FIXME stepping through code, to help you add bugs
eval ; run code, run (also, repls) eval ; run code, run (also, repls)
evil ; come to the dark side, we have cookies evil ; come to the dark side, we have cookies

55
modules/feature/popup/config.el
View file

@ -81,15 +81,6 @@ a brief description of some native window parameters that Emacs uses:
(select . ignore)) (select . ignore))
"The default window parameters.") "The default window parameters.")
(defvar +popup-enable-fallback-rules t
"If non-nil, feature/popup will declare fallback rules for any special buffer
that falls through all other rules. A special buffer starts with optional
whitespace and an asterix.")
(defvar +popup-enable-default-rules t
"If non-nil, feature/popup will declare a set of default rules for various
core Emacs and Doom buffers that should be treated as popups.")
(defvar +popup-ttl 10 (defvar +popup-ttl 10
"The default time-to-live for transient buffers whose popup buffers have been "The default time-to-live for transient buffers whose popup buffers have been
deleted.") deleted.")
@ -154,33 +145,31 @@ ALIST supports one custom parameter: `size', which will resolve to
;; Default popup rules & bootstrap ;; Default popup rules & bootstrap
;; ;;
(defun +popup|init () (eval-when-compile
(eval-when-compile (when (featurep! +all)
(when +popup-enable-fallback-rules (set! :popup "^ \\*" '((slot . 1) (vslot . -1) (size . +popup-shrink-to-fit)))
(set! :popup "^ \\*" '((slot . 1) (vslot . -1) (size . +popup-shrink-to-fit))) (set! :popup "^\\*" '((slot . 1) (vslot . -1)) '((select . t))))
(set! :popup "^\\*" '((slot . 1) (vslot . -1)) '((select . t))))
(when +popup-enable-default-rules (when (featurep! +defaults)
(set! :popup "^\\*Completions" '((slot . -1) (vslot . -2)) '((transient . 0))) (set! :popup "^\\*Completions" '((slot . -1) (vslot . -2)) '((transient . 0)))
(set! :popup "^\\*Compil\\(ation\\|e-Log\\)" nil '((transient . 0) (quit . t))) (set! :popup "^\\*Compil\\(ation\\|e-Log\\)" nil '((transient . 0) (quit . t)))
(set! :popup "^\\*\\(?:scratch\\|Messages\\)" nil '((transient))) (set! :popup "^\\*\\(?:scratch\\|Messages\\)" nil '((transient)))
(set! :popup "^\\*[Hh]elp" (set! :popup "^\\*[Hh]elp"
'((slot . 2) (vslot . 2) (size . 0.2)) '((slot . 2) (vslot . 2) (size . 0.2))
'((select . t))) '((select . t)))
(set! :popup "^\\*doom \\(?:term\\|eshell\\)" (set! :popup "^\\*doom \\(?:term\\|eshell\\)"
'((size . 0.25)) '((size . 0.25))
'((quit) (transient . 0))) '((quit) (transient . 0)))
(set! :popup "^\\*doom:" (set! :popup "^\\*doom:"
'((size . 0.35) (side . top)) '((size . 0.35) (side . bottom))
'((select . t) (modeline . t) (quit) (transient))) '((select . t) (modeline . t) (quit) (transient)))
(set! :popup "^\\*\\(?:\\(?:Pp E\\|doom e\\)val\\)" (set! :popup "^\\*\\(?:\\(?:Pp E\\|doom e\\)val\\)"
'((size . +popup-shrink-to-fit)) '((transient . 0) (select . ignore)))) '((size . +popup-shrink-to-fit)) '((transient . 0) (select . ignore))))
nil) nil)
(setq +popup--display-buffer-alist (eval-when-compile +popup--display-buffer-alist)) (setq +popup--display-buffer-alist (eval-when-compile +popup--display-buffer-alist))
(+popup-mode +1))
(add-hook 'doom-init-ui-hook #'+popup|init) (add-hook 'doom-init-ui-hook #'+popup-mode)
(add-hook! '+popup-buffer-mode-hook #'(+popup|adjust-fringes +popup|set-modeline)) (add-hook! '+popup-buffer-mode-hook #'(+popup|adjust-fringes +popup|set-modeline))