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

12
modules/completion/company/config.el
View file

@ -2,17 +2,15 @@
(def-setting! :company-backend (modes backends)
"Register company BACKENDS to MODES."
(let* ((modes (if (listp modes) modes (list modes)))
(backends (if (listp backends) backends (list backends)))
(let* ((modes (doom-enlist (doom-unquote modes)))
(backends (doom-enlist (doom-unquote backends)))
(def-name (intern (format "doom--init-company-%s"
(mapconcat #'identity (mapcar #'symbol-name modes) "-")))))
;; TODO more type checks
(mapconcat #'symbol-name modes "-")))))
`(prog1
(defun ,def-name ()
(when (memq major-mode ',modes)
(when (memq major-mode ,modes)
(require 'company)
(unless (member ',backends company-backends)
(setq-local company-backends (append '((,@backends)) company-backends)))))
(cl-pushnew ,backends company-backends :test #'equal)))
(add-hook! ,modes #',def-name))))