Merge branch 'develop' (v0.52.1)

syl20bnr · Jan 31, 2015 · bec4b4a · bec4b4a
2 parents e197d17 + 975fb17
commit bec4b4a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/init.el b/init.el
@@ -9,7 +9,7 @@
 ;; This file is not part of GNU Emacs.
 ;;
 ;;; License: GPLv3
-(defconst spacemacs-version     "0.52.0" "Spacemacs version.")
+(defconst spacemacs-version     "0.52.1" "Spacemacs version.")
 (defconst spacemacs-min-version   "24.3" "Minimal required version of Emacs.")
 
 (defun spacemacs/emacs-version-ok ()

diff --git a/spacemacs/extensions/helm-spacemacs/helm-spacemacs.el b/spacemacs/extensions/helm-spacemacs/helm-spacemacs.el
@@ -41,6 +41,8 @@
   "Layers discovery with helm interface."
   :group 'spacemacs
   :global t
+  (setq helm-spacemacs-all-layers nil
+        helm-spacemacs-all-packages nil)
   (if helm-spacemacs-mode
       (progn
         (mapc (lambda (layer) (push (configuration-layer//declare-layer layer)
@@ -49,9 +51,7 @@
         (configuration-layer//load-layer-files helm-spacemacs-all-layers
                                                '("funcs.el" "config.el"))
         (setq helm-spacemacs-all-packages (configuration-layer/get-packages
-                                           helm-spacemacs-all-layers)))
-    (setq helm-spacemacs-all-layers nil
-          helm-spacemacs-all-packages nil)))
+                                           helm-spacemacs-all-layers)))))
 
 ;;;###autoload
 (defun helm-spacemacs ()