Introduce autodefs to replace some settings
+ :popup -> set-popup-rule! + :popups -> set-popup-rules! + :company-backend -> set-company-backend! + :evil-state -> set-evil-initial-state! I am slowly phasing out the setting system (def-setting! and set!), starting with these. What are autodefs? These are functions that are always defined, whether or not their respective modules are enabled. However, when their modules are disabled, they are replaced with macros that no-op and don't waste time evaluating their arguments. The old set! function will still work, for a while.
This commit is contained in:
Henrik Lissner
parent
6693db48af
commit
d8b1e469bc
54 changed files with 329 additions and 248 deletions
|
|
@ -263,7 +263,7 @@ instead of switch-to-buffer-*."
|
|||
(inhibit-same-window . t)))
|
||||
|
||||
(add-hook 'pdf-annot-list-mode-hook #'hide-mode-line-mode)
|
||||
(set! :popup "\\(^\\*Contents\\|'s annots\\*$\\)" :ignore t))
|
||||
(set-popup-rule! "\\(^\\*Contents\\|'s annots\\*$\\)" :ignore t))
|
||||
|
||||
|
||||
;; `wgrep'
|
||||
|
|
|
|||
|
|
@ -1,72 +1,4 @@
|
|||
;;; ui/popup/autoload.el -*- lexical-binding: t; -*-
|
||||
|
||||
;;;###autoload
|
||||
(defvar +popup--display-buffer-alist nil)
|
||||
|
||||
;;;###autoload
|
||||
(def-setting! :popup (condition &optional alist parameters)
|
||||
"Define a popup rule.
|
||||
|
||||
CONDITION can be a regexp string or a function.
|
||||
|
||||
For ALIST, see `display-buffer' and `display-buffer-alist' for a list of
|
||||
possible entries, which instruct the display system how to initialize the popup
|
||||
window.
|
||||
|
||||
ALIST also supports the `size' parameter, which will be translated to
|
||||
`window-width' or `window-height' depending on `side'.
|
||||
|
||||
PARAMETERS is an alist of window parameters. See `+popup-window-parameters' for
|
||||
a list of custom parameters provided by the popup module. If certain
|
||||
attributes/parameters are omitted, the ones from `+popup-default-alist' and
|
||||
`+popup-default-parameters' will be used.
|
||||
|
||||
The buffers of new windows displayed by `pop-to-buffer' and `display-buffer'
|
||||
will be tested against CONDITION, which is either a) a regexp string (which is
|
||||
matched against the buffer's name) or b) a function that takes no arguments and
|
||||
returns a boolean."
|
||||
`(progn
|
||||
(when after-init-time
|
||||
(setq +popup--display-buffer-alist
|
||||
(map-delete +popup--display-buffer-alist ,condition)))
|
||||
(push (+popup--rule (list ,condition ,alist ,parameters))
|
||||
+popup--display-buffer-alist)
|
||||
(when (bound-and-true-p +popup-mode)
|
||||
(setq display-buffer-alist +popup--display-buffer-alist))
|
||||
+popup--display-buffer-alist))
|
||||
|
||||
;;;###autoload
|
||||
(def-setting! :popups (&rest rules)
|
||||
"Define multiple popup rules. See `doom--set:popup' for the specifications of
|
||||
each individual rule.
|
||||
|
||||
(set! :popups
|
||||
'(\"^ \\*\" ((slot . 1) (vslot . -1) (size . +popup-shrink-to-fit)))
|
||||
'(\"^\\*\" ((slot . 1) (vslot . -1)) ((select . t))))"
|
||||
`(progn
|
||||
(dolist (rule (nreverse (list ,@rules)))
|
||||
(when after-init-time
|
||||
(setq +popup--display-buffer-alist
|
||||
(map-delete +popup--display-buffer-alist (car rule))))
|
||||
(push (+popup--rule rule) +popup--display-buffer-alist))
|
||||
(when (bound-and-true-p +popup-mode)
|
||||
(setq display-buffer-alist +popup--display-buffer-alist))
|
||||
+popup--display-buffer-alist))
|
||||
|
||||
;;;###autoload
|
||||
(defsubst +popup--rule (args)
|
||||
(declare (indent 1))
|
||||
(cl-destructuring-bind (condition &optional alist parameters) args
|
||||
(if (eq alist :ignore)
|
||||
(list condition nil)
|
||||
`(,condition (+popup-buffer)
|
||||
,@alist
|
||||
(window-parameters ,@parameters)))))
|
||||
|
||||
|
||||
;;
|
||||
;; Library
|
||||
;;
|
||||
;;; ui/popup/autoload/popup.el -*- lexical-binding: t; -*-
|
||||
|
||||
(defvar +popup--populate-wparams (not EMACS26+))
|
||||
(defvar +popup--inhibit-transient nil)
|
||||
|
|
@ -135,6 +67,7 @@ and enables `+popup-buffer-mode'."
|
|||
`transient' window parameter (see `+popup-window-parameters').
|
||||
+ And finally deletes the window!"
|
||||
(let ((buffer (window-buffer window))
|
||||
(inhibit-quit t)
|
||||
ttl)
|
||||
(when (and (buffer-file-name buffer)
|
||||
(buffer-modified-p buffer)
|
||||
|
|
@ -490,7 +423,7 @@ should match the arguments of `+popup-define' or the :popup setting."
|
|||
(declare (indent defun))
|
||||
`(let ((+popup--display-buffer-alist +popup--old-display-buffer-alist)
|
||||
display-buffer-alist)
|
||||
,@(cl-loop for rule in rules collect `(set! :popup ,@rule))
|
||||
,@(cl-loop for rule in rules collect `(set-popup-rule! ,@rule))
|
||||
(when (bound-and-true-p +popup-mode)
|
||||
(setq display-buffer-alist +popup--display-buffer-alist))
|
||||
,@body))
|
||||
107
modules/ui/popup/autoload/settings.el
Normal file
107
modules/ui/popup/autoload/settings.el
Normal file
|
|
@ -0,0 +1,107 @@
|
|||
;;; ui/popup/autoload/settings.el -*- lexical-binding: t; -*-
|
||||
|
||||
(defvar +popup--display-buffer-alist nil)
|
||||
|
||||
(defsubst +popup--rule (args)
|
||||
(cl-destructuring-bind (condition &optional alist parameters) args
|
||||
(if (eq alist :ignore)
|
||||
(list condition nil)
|
||||
`(,condition (+popup-buffer)
|
||||
,@alist
|
||||
(window-parameters ,@parameters)))))
|
||||
|
||||
(defun +popup--define (condition &optional alist parameters)
|
||||
(when after-init-time
|
||||
(setq +popup--display-buffer-alist
|
||||
(map-delete +popup--display-buffer-alist condition)))
|
||||
(push (+popup--rule (list condition alist parameters))
|
||||
+popup--display-buffer-alist))
|
||||
|
||||
;;;###autodef
|
||||
(defun set-popup-rule! (condition &optional alist parameters)
|
||||
"Define a popup rule.
|
||||
|
||||
CONDITION can be a regexp string or a function.
|
||||
|
||||
For ALIST, see `display-buffer' and `display-buffer-alist' for a list of
|
||||
possible entries, which instruct the display system how to initialize the popup
|
||||
window.
|
||||
|
||||
ALIST also supports the `size' parameter, which will be translated to
|
||||
`window-width' or `window-height' depending on `side'.
|
||||
|
||||
PARAMETERS is an alist of window parameters. See `+popup-window-parameters' for
|
||||
a list of custom parameters provided by the popup module. If certain
|
||||
attributes/parameters are omitted, the ones from `+popup-default-alist' and
|
||||
`+popup-default-parameters' will be used.
|
||||
|
||||
The buffers of new windows displayed by `pop-to-buffer' and `display-buffer'
|
||||
will be tested against CONDITION, which is either a) a regexp string (which is
|
||||
matched against the buffer's name) or b) a function that takes no arguments and
|
||||
returns a boolean.
|
||||
|
||||
See `def-popups!' for defining multiple rules in bulk."
|
||||
(+popup--define condition alist parameters)
|
||||
(when (bound-and-true-p +popup-mode)
|
||||
(setq display-buffer-alist +popup--display-buffer-alist))
|
||||
+popup--display-buffer-alist)
|
||||
|
||||
;;;###autodef
|
||||
(defun set-popup-rules! (&rest rulesets)
|
||||
"Define multiple popup rules. See `def-popup!' for the specifications of each
|
||||
individual rule.
|
||||
|
||||
(set-popup-rules!
|
||||
'((\"^ \\*\" ((slot . 1) (vslot . -1) (size . +popup-shrink-to-fit)))
|
||||
(\"^\\*\" ((slot . 1) (vslot . -1)) ((select . t)))))"
|
||||
(dolist (ruleset rulesets)
|
||||
(dolist (rule ruleset)
|
||||
(apply #'+popup--define rule)))
|
||||
(when (bound-and-true-p +popup-mode)
|
||||
(setq display-buffer-alist +popup--display-buffer-alist))
|
||||
+popup--display-buffer-alist)
|
||||
|
||||
|
||||
;;
|
||||
;; Obsolete
|
||||
;;
|
||||
|
||||
;; FIXME obsolete :popup
|
||||
;;;###autoload
|
||||
(def-setting! :popup (condition &optional alist parameters)
|
||||
"Define a popup rule.
|
||||
|
||||
CONDITION can be a regexp string or a function.
|
||||
|
||||
For ALIST, see `display-buffer' and `display-buffer-alist' for a list of
|
||||
possible entries, which instruct the display system how to initialize the popup
|
||||
window.
|
||||
|
||||
ALIST also supports the `size' parameter, which will be translated to
|
||||
`window-width' or `window-height' depending on `side'.
|
||||
|
||||
PARAMETERS is an alist of window parameters. See `+popup-window-parameters' for
|
||||
a list of custom parameters provided by the popup module. If certain
|
||||
attributes/parameters are omitted, the ones from `+popup-default-alist' and
|
||||
`+popup-default-parameters' will be used.
|
||||
|
||||
The buffers of new windows displayed by `pop-to-buffer' and `display-buffer'
|
||||
will be tested against CONDITION, which is either a) a regexp string (which is
|
||||
matched against the buffer's name) or b) a function that takes no arguments and
|
||||
returns a boolean.
|
||||
|
||||
See `def-popups!' for defining multiple rules in bulk."
|
||||
:obsolete set-popup-rule!
|
||||
`(set-popup-rule! ,condition ,alist ,parameters))
|
||||
|
||||
;; FIXME obsolete :popups
|
||||
;;;###autoload
|
||||
(def-setting! :popups (&rest rulesets)
|
||||
"Define multiple popup rules. See `def-popup!' for the specifications of each
|
||||
individual rule.
|
||||
|
||||
(set-popup-rules!
|
||||
'((\"^ \\*\" ((slot . 1) (vslot . -1) (size . +popup-shrink-to-fit)))
|
||||
(\"^\\*\" ((slot . 1) (vslot . -1)) ((select . t)))))"
|
||||
:obsolete set-popup-rules!
|
||||
`(set-popup-rules! ,@rulesets))
|
||||
|
|
@ -102,45 +102,43 @@ deleted.")
|
|||
;; Default popup rules & bootstrap
|
||||
;;
|
||||
|
||||
(when (featurep! +all)
|
||||
(set! :popups
|
||||
'("^ \\*" ((slot . 1) (vslot . -1) (size . +popup-shrink-to-fit)))
|
||||
'("^\\*" ((slot . 1) (vslot . -1)) ((select . t)))))
|
||||
|
||||
(when (featurep! +defaults)
|
||||
(set! :popups
|
||||
'("^\\*Completions"
|
||||
((slot . -1) (vslot . -2))
|
||||
((transient . 0)))
|
||||
'("^\\*Compil\\(?:ation\\|e-Log\\)"
|
||||
((size . 0.3))
|
||||
((transient . 0) (quit . t)))
|
||||
'("^\\*\\(?:scratch\\|Messages\\)"
|
||||
nil
|
||||
((autosave . t) (transient)))
|
||||
'("^\\*doom \\(?:term\\|eshell\\)"
|
||||
((size . 0.25) (vslot . -10))
|
||||
((select . t) (quit) (transient . 0)))
|
||||
'("^\\*doom:"
|
||||
((size . 0.35) (side . bottom))
|
||||
((autosave . t) (select . t) (modeline . t) (quit) (transient . t)))
|
||||
'("^\\*\\(?:\\(?:Pp E\\|doom e\\)val\\)"
|
||||
((size . +popup-shrink-to-fit))
|
||||
((transient . 0) (select . ignore)))
|
||||
'("^\\*Customize"
|
||||
((slot . 2) (side . right))
|
||||
((modeline . nil) (select . t) (quit . t)))
|
||||
'("^ \\*undo-tree\\*"
|
||||
((slot . 2) (side . left) (size . 20))
|
||||
((modeline . nil) (select . t) (quit . t)))
|
||||
;; `help-mode', `helpful-mode'
|
||||
'("^\\*[Hh]elp"
|
||||
((slot . 2) (vslot . 2) (size . 0.25))
|
||||
((select . t)))
|
||||
;; `Info-mode'
|
||||
'("^\\*info\\*$"
|
||||
((slot . 2) (vslot . 2) (size . 0.45))
|
||||
((select . t)))))
|
||||
(set-popup-rules!
|
||||
(when (featurep! +all)
|
||||
'(("^\\*" ((slot . 1) (vslot . -1)) ((select . t)))
|
||||
("^ \\*" ((slot . 1) (vslot . -1) (size . +popup-shrink-to-fit)))))
|
||||
(when (featurep! +defaults)
|
||||
'(("^\\*Completions"
|
||||
((slot . -1) (vslot . -2))
|
||||
((transient . 0)))
|
||||
("^\\*Compil\\(?:ation\\|e-Log\\)"
|
||||
((size . 0.3))
|
||||
((transient . 0) (quit . t)))
|
||||
("^\\*\\(?:scratch\\|Messages\\)"
|
||||
nil
|
||||
((autosave . t) (transient)))
|
||||
("^\\*doom \\(?:term\\|eshell\\)"
|
||||
((size . 0.25) (vslot . -10))
|
||||
((select . t) (quit) (transient . 0)))
|
||||
("^\\*doom:"
|
||||
((size . 0.35) (side . bottom))
|
||||
((autosave . t) (select . t) (modeline . t) (quit) (transient . t)))
|
||||
("^\\*\\(?:\\(?:Pp E\\|doom e\\)val\\)"
|
||||
((size . +popup-shrink-to-fit))
|
||||
((transient . 0) (select . ignore)))
|
||||
("^\\*Customize"
|
||||
((slot . 2) (side . right))
|
||||
((modeline . nil) (select . t) (quit . t)))
|
||||
("^ \\*undo-tree\\*"
|
||||
((slot . 2) (side . left) (size . 20))
|
||||
((modeline . nil) (select . t) (quit . t)))
|
||||
;; `help-mode', `helpful-mode'
|
||||
("^\\*[Hh]elp"
|
||||
((slot . 2) (vslot . 2) (size . 0.25))
|
||||
((select . t)))
|
||||
;; `Info-mode'
|
||||
("^\\*info\\*$"
|
||||
((slot . 2) (vslot . 2) (size . 0.45))
|
||||
((select . t))))))
|
||||
|
||||
(add-hook 'doom-init-ui-hook #'+popup-mode)
|
||||
(add-hook! '+popup-buffer-mode-hook
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue