Cheer up the byte-compiler

You deserve better than those warnings.
This commit is contained in:
Henrik Lissner 2019-05-02 21:54:47 -04:00
parent 25beb4bcfd
commit 388e0def2c
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 16 additions and 15 deletions

View file

@ -61,6 +61,7 @@ If a mode is quoted, it is left as is."
else collect (intern (format "%s-hook" (symbol-name hook)))))
(defun doom--assert-stage-p (stage macro)
(unless (bound-and-true-p byte-compile-current-file)
(cl-assert (eq stage doom--stage)
nil
"Found %s call in non-%s.el file (%s)"
@ -68,7 +69,7 @@ If a mode is quoted, it is left as is."
(let ((path (FILE!)))
(if (file-in-directory-p path doom-emacs-dir)
(file-relative-name path doom-emacs-dir)
(abbreviate-file-name path)))))
(abbreviate-file-name path))))))
;;

View file

@ -205,14 +205,14 @@ elsewhere."
(pop plist))
(setq plist old-plist)
(macroexp-progn
(append (when disable
(doom-log "Disabling package '%s'" name)
`((add-to-list 'doom-disabled-packages ',name nil 'eq)))
(when pin
(append (when pin
(doom-log "Pinning package '%s' to '%s'" name pin)
`((setf (alist-get ',name package-pinned-packages) ,pin)))
`((setf (alist-get ',name doom-packages) ',plist)
(not (memq ',name doom-disabled-packages)))))))
`((setf (alist-get ',name doom-packages) ',plist))
(when disable
(doom-log "Disabling package '%s'" name)
`((add-to-list 'doom-disabled-packages ',name nil 'eq)
nil))))))
(defmacro packages! (&rest packages)
"A convenience macro for `package!' for declaring multiple packages at once.

View file

@ -94,7 +94,7 @@ combined.")
This file contains environment variables scraped from your shell environment,
which is loaded at startup (if it exists). This is helpful if Emacs can't
(easily) be launched from the correct shell session (particularly for MacOS
\(easily) be launched from the correct shell session (particularly for MacOS
users).")