From ca370430f4f2b4450c055ff0460c51971f1ac532 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Sun, 5 Oct 2014 00:14:50 -0400 Subject: [PATCH] Make optional packages.el and extensions.el file in configuration layers --- core/contribsys.el | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/core/contribsys.el b/core/contribsys.el index 059b49c43..e9e5f5052 100644 --- a/core/contribsys.el +++ b/core/contribsys.el @@ -85,17 +85,19 @@ extension. (ext-file (concat dir "extensions.el"))) (progn ;; packages - (load pkg-file) - (dolist (pkg (eval (intern (format "%s-packages" (symbol-name sym))))) - (puthash pkg sym spacemacs-all-packages)) + (unless (not (file-exists-p pkg-file)) + (load pkg-file) + (dolist (pkg (eval (intern (format "%s-packages" (symbol-name sym))))) + (puthash pkg sym spacemacs-all-packages))) ;; extensions - (load ext-file) - (dolist (pkg (eval (intern (format "%s-pre-extensions" - (symbol-name sym))))) - (puthash pkg sym spacemacs-all-pre-extensions)) - (dolist (pkg (eval (intern (format "%s-post-extensions" - (symbol-name sym))))) - (puthash pkg sym spacemacs-all-post-extensions))))) + (unless (not (file-exists-p ext-file)) + (load ext-file) + (dolist (pkg (eval (intern (format "%s-pre-extensions" + (symbol-name sym))))) + (puthash pkg sym spacemacs-all-pre-extensions)) + (dolist (pkg (eval (intern (format "%s-post-extensions" + (symbol-name sym))))) + (puthash pkg sym spacemacs-all-post-extensions)))))) ;; number of chuncks for the loading screen (let ((total (+ (ht-size spacemacs-all-packages) (ht-size spacemacs-all-pre-extensions)