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

Macros now prefixed with @, instead of suffixed with !

Browse source
This commit is contained in:
Henrik Lissner 2017-02-09 04:22:08 -05:00
parent ec694649db
commit 6c06aa0ce7
26 changed files with 265 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/autoload/packages.el
View file

@ -111,18 +111,18 @@ fed to `doom/packages-delete'."
;;;###autoload
(defun doom-read-packages (&optional force-p nopackages)
"Parses your Emacs config to keep track of packages declared with `package!'
"Parses your Emacs config to keep track of packages declared with `@package'
in `doom-packages' and enabled modules in `doom-modules'."
(doom-initialize)
(when (or force-p (not doom-modules) (not doom-packages))
(setq doom-modules
(let (paths mode enabled-modules)
(--each (doom--scrape-sexps 'doom! (f-expand "init.el" doom-emacs-dir))
(--each (doom--scrape-sexps '@doom (f-expand "init.el" doom-emacs-dir))
(dolist (module it)
(cond ((keywordp module)
(setq mode module))
((not mode)
(error "Malformed doom! call: no namespace for %s" module))
(error "Malformed @doom call: no namespace for %s" module))
(t
(push (cons mode module) enabled-modules)))))
enabled-modules))
@ -131,8 +131,8 @@ in `doom-packages' and enabled modules in `doom-modules'."
(setq package-pinned-packages nil
doom-packages nil)
(mapc (lambda (pkg) (cl-pushnew pkg doom-packages :key 'car))
(-map (lambda (args)
(plist! args &delete
(-map (lambda (mplist)
(@mplist mplist &delete
:preface :ensure :requires :no-require :bind :bind* :bind-keymap
:bind-keymap* :interpreter :mode :commands :defines :functions
:defer :init :after :demand :config :diminish :delight))
@ -141,7 +141,7 @@ in `doom-packages' and enabled modules in `doom-modules'."
(-flatten-n
1 (mapcar (lambda (file)
(when (f-exists-p file)
(doom--scrape-sexps 'package! file)))
(doom--scrape-sexps '@package file)))
(append (f-glob "core*.el" doom-core-dir)
(--map (doom-module-path (car it) (cdr it) "packages.el")
doom-modules)))))))

12
core/autoload/set.el
View file

@ -15,9 +15,9 @@
be a lambda or symbol.")
;;;###autoload
(defmacro def-setting! (keyword arglist &optional docstring &rest forms)
(defmacro @def-setting (keyword arglist &optional docstring &rest forms)
"Define a setting macro. Like `defmacro', this should return a form to be
executed when called with `set!'. FORMS are not evaluated until `set!' calls it."
executed when called with `@set'. FORMS are not evaluated until `@set' calls it."
(declare (indent defun) (doc-string 3))
(unless (keywordp keyword)
(error "Not a valid property name: %s" keyword))
@ -37,13 +37,13 @@ executed when called with `set!'. FORMS are not evaluated until `set!' calls it.
(byte-compile sym)))))
;;;###autoload
(defmacro set! (keyword &rest values)
"Set an option defined by `def-setting!'. Skip if doesn't exist."
(defmacro @set (keyword &rest values)
"Set an option defined by `@def-setting'. Skip if doesn't exist."
(declare (indent defun))
(unless values
(error "Empty set! for %s" keyword))
(error "Empty @set for %s" keyword))
(cond ((not values)
(error "Empty set! for %s" keyword))
(error "Empty @set for %s" keyword))
((not (assq keyword doom-settings))
(when doom-debug-mode
(warn "No setting found for %s" keyword)))