From 5c36519dab0e56101d809dde0a9ff77bf081a9da Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 12 Mar 2018 13:12:40 -0400
Subject: [PATCH] Ignore package! if package is disabled

This allows you to disable packages with (def-package-hook! X :disable)
without an accompanying (package! X :ignore t). This reduces redundancy.
---
 core/core-packages.el | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/core/core-packages.el b/core/core-packages.el
index 9634c422c..806d28d46 100644
--- a/core/core-packages.el
+++ b/core/core-packages.el
@@ -527,22 +527,23 @@ Accepts the following properties:
  :ignore FORM          Do not install this package if FORM is non-nil.
  :freeze FORM          Do not update this package if FORM is non-nil."
   (declare (indent defun))
-  (let* ((old-plist (assq name doom-packages))
-         (pkg-recipe (or (plist-get plist :recipe)
-                         (and old-plist (plist-get old-plist :recipe))))
-         (pkg-pin    (or (plist-get plist :pin)
-                         (and old-plist (plist-get old-plist :pin)))))
-    (when pkg-recipe
-      (when (= 0 (% (length pkg-recipe) 2))
-        (plist-put plist :recipe (cons name pkg-recipe)))
-      (when pkg-pin
-        (plist-put plist :pin nil)))
-    (dolist (prop '(:ignore :freeze))
-      (when-let* ((val (plist-get plist prop)))
-        (plist-put plist prop (eval val))))
-    `(progn
-       ,(if (and pkg-pin t) `(map-put package-pinned-packages ',name ,pkg-pin))
-       (map-put doom-packages ',name ',plist))))
+  (unless (memq name doom-disabled-packages)
+    (let* ((old-plist (assq name doom-packages))
+           (pkg-recipe (or (plist-get plist :recipe)
+                           (and old-plist (plist-get old-plist :recipe))))
+           (pkg-pin    (or (plist-get plist :pin)
+                           (and old-plist (plist-get old-plist :pin)))))
+      (when pkg-recipe
+        (when (= 0 (% (length pkg-recipe) 2))
+          (plist-put plist :recipe (cons name pkg-recipe)))
+        (when pkg-pin
+          (plist-put plist :pin nil)))
+      (dolist (prop '(:ignore :freeze))
+        (when-let* ((val (plist-get plist prop)))
+          (plist-put plist prop (eval val))))
+      `(progn
+         ,(if (and pkg-pin t) `(map-put package-pinned-packages ',name ,pkg-pin))
+         (map-put doom-packages ',name ',plist)))))
 
 (defmacro depends-on! (module submodule &optional flags)
   "Declares that this module depends on another.