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

defpopup! => def-popup!

Browse source
This commit is contained in:
Henrik Lissner 2017-02-01 00:31:08 -05:00
parent 6b07f23b4c
commit a20bdb28b2
2 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/core-editor.el
View file

@ -189,7 +189,7 @@
(package! wgrep (package! wgrep
:commands (wgrep-setup wgrep-change-to-wgrep-mode) :commands (wgrep-setup wgrep-change-to-wgrep-mode)
:config :config
(defpopup! ("^\\*ivy-occur counsel-ag" :size 25 :select t :regexp t)) (def-popup! ("^\\*ivy-occur counsel-ag" :size 25 :select t :regexp t))
(setq wgrep-auto-save-buffer t) (setq wgrep-auto-save-buffer t)
(advice-add 'wgrep-abort-changes :after 'doom/popup-close) (advice-add 'wgrep-abort-changes :after 'doom/popup-close)
(advice-add 'wgrep-finish-edit :after 'doom/popup-close)) (advice-add 'wgrep-finish-edit :after 'doom/popup-close))

39
core/core-popups.el
View file

@ -21,7 +21,7 @@
(setq shackle-default-alignment 'below (setq shackle-default-alignment 'below
shackle-select-reused-windows t) shackle-select-reused-windows t)
(defmacro defpopup! (&rest rules) (defmacro def-popup! (&rest rules)
"Define one or more popup rules. See `shackle-rules' for the format of these "Define one or more popup rules. See `shackle-rules' for the format of these
rules. If :align is omitted, it will use `shackle-default-alignment'." rules. If :align is omitted, it will use `shackle-default-alignment'."
(declare (indent 0)) (declare (indent 0))
@ -43,24 +43,25 @@ rules. If :align is omitted, it will use `shackle-default-alignment'."
;; :noesc and :modeline are custom settings and are not part of shackle. See ;; :noesc and :modeline are custom settings and are not part of shackle. See
;; `doom*popup-init' and `doom-popup-buffer' for how they're used. ;; `doom*popup-init' and `doom-popup-buffer' for how they're used.
(defpopup! ("^ ?\\*doom:.+\\*$" :size 35 :regexp t :modeline t) (def-popup!
("^ ?\\*doom .+\\*$" :size 12 :noselect t :regexp t :modeline t) ("^ ?\\*doom:.+\\*$" :size 35 :regexp t :modeline t)
("^\\*.+-Profiler-Report .+\\*$" :size 0.3 :regexp t) ("^ ?\\*doom .+\\*$" :size 12 :noselect t :regexp t :modeline t)
("*esup*" :size 0.4 :noselect t :noesc t) ("^\\*.+-Profiler-Report .+\\*$" :size 0.3 :regexp t)
("*minor-modes*" :size 0.5 :noselect t) ("*esup*" :size 0.4 :noselect t :noesc t)
("*eval*" :size 16 :noselect t) ("*minor-modes*" :size 0.5 :noselect t)
("*Pp Eval Output*" :size 0.3) ("*eval*" :size 16 :noselect t)
("*Apropos*" :size 0.3) ("*Pp Eval Output*" :size 0.3)
("*Backtrace*" :size 25 :noselect t) ("*Apropos*" :size 0.3)
("*Help*" :size 16) ("*Backtrace*" :size 25 :noselect t)
("*Messages*" :size 10 :select t) ("*Help*" :size 16)
("*Warnings*" :size 10 :noselect t) ("*Messages*" :size 10 :select t)
("*command-log*" :size 28 :noselect t :align right) ("*Warnings*" :size 10 :noselect t)
(compilation-mode :size 15 :noselect t :noesc t) ("*command-log*" :size 28 :noselect t :align right)
(ivy-occur-grep-mode :size 25 :noesc t) (compilation-mode :size 15 :noselect t :noesc t)
(eww-mode :size 30) (ivy-occur-grep-mode :size 25 :noesc t)
(comint-mode :noesc t) (eww-mode :size 30)
(tabulated-list-mode :noesc t)) (comint-mode :noesc t)
(tabulated-list-mode :noesc t))
(defvar doom-popup-history nil (defvar doom-popup-history nil
"A list of popups that were last closed. Used by `doom/popup-restore' and "A list of popups that were last closed. Used by `doom/popup-restore' and