From 388e0def2cb6f735566f69170a40410b49431835 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Thu, 2 May 2019 21:54:47 -0400
Subject: [PATCH] Cheer up the byte-compiler

You deserve better than those warnings.
---
 core/core-lib.el      | 17 +++++++++--------
 core/core-packages.el | 12 ++++++------
 core/core.el          |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/core/core-lib.el b/core/core-lib.el
index 6c50a5b41..5795e0b42 100644
--- a/core/core-lib.el
+++ b/core/core-lib.el
@@ -61,14 +61,15 @@ 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)
-  (cl-assert (eq stage doom--stage)
-             nil
-             "Found %s call in non-%s.el file (%s)"
-             macro (symbol-name stage)
-             (let ((path (FILE!)))
-               (if (file-in-directory-p path doom-emacs-dir)
-                   (file-relative-name path doom-emacs-dir)
-                 (abbreviate-file-name path)))))
+  (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)"
+               macro (symbol-name stage)
+               (let ((path (FILE!)))
+                 (if (file-in-directory-p path doom-emacs-dir)
+                     (file-relative-name path doom-emacs-dir)
+                   (abbreviate-file-name path))))))
 
 
 ;;
diff --git a/core/core-packages.el b/core/core-packages.el
index d28d176d0..290554db3 100644
--- a/core/core-packages.el
+++ b/core/core-packages.el
@@ -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.
diff --git a/core/core.el b/core/core.el
index 9dd31a31c..ef6f4fd7d 100644
--- a/core/core.el
+++ b/core/core.el
@@ -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).")