Fix void macro errors after byte-compiling

This commit is contained in:
Henrik Lissner 2018-05-15 03:24:30 +02:00
parent 1320d83834
commit 9a2c4f297c
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 14 additions and 12 deletions

View file

@ -76,10 +76,11 @@
(defvar +default-repeat-forward-key ";") (defvar +default-repeat-forward-key ";")
(defvar +default-repeat-backward-key ",") (defvar +default-repeat-backward-key ",")
(eval-and-compile (eval-when-compile
;; Makes ; and , the universal repeat-keys in evil-mode
(defmacro do-repeat! (command next-func prev-func) (defmacro do-repeat! (command next-func prev-func)
"Repeat motions with ;/," "Makes ; and , the universal repeat-keys in evil-mode. These keys can be
customized by changing `+default-repeat-forward-key' and
`+default-repeat-backward-key'."
(let ((fn-sym (intern (format "+evil*repeat-%s" (doom-unquote command))))) (let ((fn-sym (intern (format "+evil*repeat-%s" (doom-unquote command)))))
`(progn `(progn
(defun ,fn-sym (&rest _) (defun ,fn-sym (&rest _)

View file

@ -206,15 +206,16 @@ unfold to point on startup."
(unless (file-remote-p path) (unless (file-remote-p path)
(if (file-exists-p path) 'org-link 'error)))) (if (file-exists-p path) 'org-link 'error))))
(defmacro def-org-file-link! (key dir) (eval-when-compile
`(org-link-set-parameters (defmacro def-org-file-link! (key dir)
,key `(org-link-set-parameters
:complete (lambda () (+org--relpath (+org-link-read-file ,key ,dir) ,dir)) ,key
:follow (lambda (link) (find-file (expand-file-name link ,dir))) :complete (lambda () (+org--relpath (+org-link-read-file ,key ,dir) ,dir))
:face (lambda (link) :follow (lambda (link) (find-file (expand-file-name link ,dir)))
(if (file-exists-p (expand-file-name link ,dir)) :face (lambda (link)
'org-link (if (file-exists-p (expand-file-name link ,dir))
'error)))) 'org-link
'error)))))
(def-org-file-link! "org" +org-dir) (def-org-file-link! "org" +org-dir)
(def-org-file-link! "doom" doom-emacs-dir) (def-org-file-link! "doom" doom-emacs-dir)