From 9a2c4f297c2178d85cddd1389b4645ff6e6eb2c2 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 15 May 2018 03:24:30 +0200
Subject: [PATCH] Fix void macro errors after byte-compiling

---
 modules/config/default/config.el |  7 ++++---
 modules/lang/org/config.el       | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index 0937f87fc..6d5ba386b 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -76,10 +76,11 @@
     (defvar +default-repeat-forward-key ";")
     (defvar +default-repeat-backward-key ",")
 
-    (eval-and-compile
-      ;; Makes ; and , the universal repeat-keys in evil-mode
+    (eval-when-compile
       (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)))))
           `(progn
              (defun ,fn-sym (&rest _)
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 70e1f2c05..5dffd23fd 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -206,15 +206,16 @@ unfold to point on startup."
            (unless (file-remote-p path)
              (if (file-exists-p path) 'org-link 'error))))
 
-  (defmacro def-org-file-link! (key dir)
-    `(org-link-set-parameters
-      ,key
-      :complete (lambda () (+org--relpath (+org-link-read-file ,key ,dir) ,dir))
-      :follow   (lambda (link) (find-file (expand-file-name link ,dir)))
-      :face     (lambda (link)
-                  (if (file-exists-p (expand-file-name link ,dir))
-                      'org-link
-                    'error))))
+  (eval-when-compile
+    (defmacro def-org-file-link! (key dir)
+      `(org-link-set-parameters
+        ,key
+        :complete (lambda () (+org--relpath (+org-link-read-file ,key ,dir) ,dir))
+        :follow   (lambda (link) (find-file (expand-file-name link ,dir)))
+        :face     (lambda (link)
+                    (if (file-exists-p (expand-file-name link ,dir))
+                        'org-link
+                      'error)))))
 
   (def-org-file-link! "org" +org-dir)
   (def-org-file-link! "doom" doom-emacs-dir)