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

Make def-setting! behave more like defmacro

Browse source 
set! used to aggressively evaluate its arguments (at expansion-time),
even if placed inside an after! block. This causes unavoidable errors if
those arguments use functions/variables that don't exist yet.

Fixes #112
This commit is contained in:
Henrik Lissner 2017-06-19 00:22:04 +02:00
parent 27cbd36b69
commit 928812da8a
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
12 changed files with 104 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/tools/rotate-text/config.el
View file

@ -9,17 +9,13 @@
(def-setting! :rotate (modes &rest plist)
"Declare :symbols, :words or :patterns that `rotate-text' will cycle through."
(declare (indent 1))
(let ((modes (if (listp modes) modes (list modes)))
(symbols (plist-get plist :symbols))
(words (plist-get plist :words))
(patterns (plist-get plist :patterns)))
(when (or symbols words patterns)
(let ((fn-name (intern (format "doom--rotate-%s" (string-join (mapcar #'symbol-name modes) "-")))))
`(progn
(defun ,fn-name ()
(require 'rotate-text)
,(if symbols `(setq rotate-text-local-symbols ',symbols))
,(if words `(setq rotate-text-local-words ',words))
,(if patterns `(setq rotate-text-local-patterns ',patterns)))
(add-hook! ,modes #',fn-name))))))
(let* ((modes (doom-enlist (doom-unquote modes)))
(fn-name (intern (format "doom--rotate-%s" (mapconcat #'symbol-name modes "-")))))
`(progn
(defun ,fn-name ()
(let ((plist (list ,@plist)))
(setq rotate-text-local-symbols (plist-get plist :symbols)
rotate-text-local-words (plist-get plist :words)
rotate-text-local-patterns (plist-get plist :patterns))))
(add-hook! ,modes #',fn-name))))