From 19a786e1a2bdf3189759ad57f07d5fffbf423bb0 Mon Sep 17 00:00:00 2001 From: Allen Li Date: Tue, 14 Jun 2016 14:49:12 -0700 Subject: [PATCH] Don't un-exclude an excluded package If a layer using a package is loaded after a layer excluding it, the exclude flag should not be overwritten. --- core/core-configuration-layer.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-configuration-layer.el b/core/core-configuration-layer.el index 3a4089a7a2c7..0bdc43946934 100644 --- a/core/core-configuration-layer.el +++ b/core/core-configuration-layer.el @@ -490,7 +490,7 @@ If TOGGLEP is non nil then `:toggle' parameter is ignored." (obj (if obj obj (cfgl-package name-str :name name-sym)))) (when location (oset obj :location location)) (when step (oset obj :step step)) - (oset obj :excluded excluded) + (oset obj :excluded (or excluded (oref obj :excluded))) (when toggle (oset obj :toggle toggle)) ;; cannot override protected packages (unless copyp