Merge branch 'develop' (v0.37.3)

syl20bnr · Dec 22, 2014 · 4245feb · 4245feb
2 parents 7c412f5 + 3901e70
commit 4245feb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/core/config-system.el b/core/config-system.el
@@ -285,9 +285,10 @@ VAR is a string with value `packages', `pre-extensions' or `post-extensions'."
         (when (file-exists-p pkg-file)
           (config-system/load-file pkg-file)
           (let* ((layer-name (symbol-name layer-sym))
-                 (packages (eval (intern (format "%s-%s" layer-name var)))))
-            (dolist (pkg packages)
-              (puthash pkg (cons layer-sym (ht-get result pkg)) result))))))
+                 (packages-var (intern (format "%s-%s" layer-name var))))
+            (when (boundp packages-var)
+              (dolist (pkg (eval packages-var))
+                (puthash pkg (cons layer-sym (ht-get result pkg)) result)))))))
     (ht-copy result)))
 
 (defun config-system/get-packages (layers)