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 2018-06-15 02:58:12 +02:00
parent 6693db48af
commit d8b1e469bc
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
54 changed files with 329 additions and 248 deletions

View file

@ -3,7 +3,7 @@
(def-package! realgud
:commands (realgud:gdb realgud:trepanjs realgud:bashdb realgud:zshdb)
:config
(set! :popup "^\\*\\(?trepanjs:\\(?:g\\|zsh\\|bash\\)db\\)"
(set-popup-rule! "^\\*\\(?trepanjs:\\(?:g\\|zsh\\|bash\\)db\\)"
'((size . 20)))
;; TODO Temporary Ex commands for the debugger

View file

@ -17,7 +17,7 @@
:config
(setq quickrun-focus-p nil)
(set! :popup "^\\*quickrun" '((size . 0.3)) '((transient . 0)))
(set-popup-rule! "^\\*quickrun" '((size . 0.3)) '((transient . 0)))
(defun +eval*quickrun-auto-close (&rest _)
"Allows us to silently re-run quickrun from within the quickrun buffer."

View file

@ -1,15 +1,21 @@
;; feature/evil/autoload/evil.el -*- lexical-binding: t; -*-
;;;###if (featurep! :feature evil)
;;;###autodef
(defun set-evil-initial-state! (modes state)
"Set the initialize STATE of MODE using `evil-set-initial-state'."
(after! evil
(if (listp modes)
(dolist (mode modes)
(evil-set-initial-state mode state))
(evil-set-initial-state modes state))))
;; FIXME obsolete :evil-state
;;;###autoload
(def-setting! :evil-state (modes state)
"Set the initialize STATE of MODE using `evil-set-initial-state'."
(let ((unquoted-modes (doom-unquote modes)))
(if (listp unquoted-modes)
`(progn
,@(cl-loop for mode in unquoted-modes
collect `(evil-set-initial-state ',mode ,state)))
`(evil-set-initial-state ,modes ,state))))
:obsolete set-evil-initial-state!
`(set-evil-initial-state! ,modes ,state))
;;

View file

@ -66,8 +66,9 @@ variable for an explanation of the defaults (in comments). See
(put 'evil-define-key* 'lisp-indent-function 'defun)
(set! :popup "^\\*evil-registers" '((size . 0.3)))
(set! :popup "^\\*Command Line" '((size . 8)))
(set-popup-rules!
'(("^\\*evil-registers" ((size . 0.3)))
("^\\*Command Line" ((size . 8)))))
;; Change the cursor color in emacs mode
(defvar +evil--default-cursor-color "#ffffff")

View file

@ -1,7 +1,7 @@
;;; feature/file-templates/autoload.el -*- lexical-binding: t; -*-
;;;###autoload
(def-setting! :file-template (pred &rest plist)
;;;###autodef
(defun set-file-template! (pred &rest plist)
"Register a file template.
PRED can either be a regexp string or a major mode symbol. PLIST may contain
@ -24,11 +24,23 @@ these properties:
file template rule against this buffer."
`(push (list ,pred ,@plist) +file-templates-alist))
;;;###autoload
(def-setting! :file-templates (&rest templates)
;;;###autodef
(defun set-file-templates! (&rest templates)
"Like `doom--set:file-template', but register many file templates at once."
`(setq +file-templates-alist (append (list ,@templates) +file-templates-alist)))
;; FIXME obsolete :file-template
;;;###autoload
(def-setting! :file-template (pred &rest plist)
:obsolete set-file-template!
`(set-file-template! ,pred ,@plist))
;; FIXME obsolete :file-templates
;;;###autoload
(def-setting! :file-templates (&rest templates)
:obsolete set-file-templates!
`(set-file-templates! ,@templates))
;;
;; Library

View file

@ -20,7 +20,7 @@
(git-gutter-mode +1)))
(add-hook! (text-mode prog-mode conf-mode) #'+version-control|git-gutter-maybe)
:config
(set! :popup "^\\*git-gutter" nil '((select)))
(set-popup-rule! "^\\*git-gutter" nil '((select)))
;; Update git-gutter on focus (in case I was using git externally)
(add-hook 'focus-in-hook #'git-gutter:update-all-windows)

View file

@ -11,11 +11,12 @@
(after! vc-annotate
(set! :popup "^\\vc-d" nil '((select))) ; *vc-diff*
(set! :popup "^\\vc-c" nil '((select . t))) ; *vc-change-log*
(set! :evil-state 'vc-annotate-mode 'normal)
(set! :evil-state 'vc-git-log-view-mode 'normal))
(set-popup-rules!
'(("^\\vc-d" nil ((select))) ; *vc-diff*
("^\\vc-c" nil ((select . t))))) ; *vc-change-log*
(set-evil-initial-state!
'(vc-annotate-mode vc-git-log-view-mode)
'normal))
(def-package! smerge-mode
:hook (find-file . +vcs|enable-smerge-mode-maybe)