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

Fix empty load-file-name in warn! macro during byte-compilation

Browse source
This commit is contained in:
Henrik Lissner 2018-02-14 20:52:25 -05:00
parent 0f404a513a
commit ae52b2ff60
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/autoload/message.el
View file

@ -83,11 +83,12 @@ interactive session."
;;;###autoload
(defmacro warn! (message &rest args)
"Output a colored warning for the current module in the *Messages* buffer."
(if (file-in-directory-p load-file-name doom-modules-dir)
`(cl-destructuring-bind (cat . mod) (doom-module-from-path ,load-file-name)
(delay-warning (format "%s %s" cat mod) (format ,message ,@args) :warning))
`(delay-warning (file-relative-name load-file-name doom-emacs-dir)
(format ,message ,@args) :warning)))
(let ((load-file-name (or load-file-name byte-compile-current-file)))
(if (file-in-directory-p load-file-name doom-modules-dir)
`(cl-destructuring-bind (cat . mod) (doom-module-from-path ,load-file-name)
(delay-warning (format "%s %s" cat mod) (format ,message ,@args) :warning))
`(delay-warning (file-relative-name load-file-name doom-emacs-dir)
(format ,message ,@args) :warning))))
;;;###autoload
(defmacro log! (message &rest args)