Merge branch 'develop' (v0.64.1)

syl20bnr · Mar 3, 2015 · 264b6ce · 264b6ce
2 parents 512c9b5 + 0e69d7f
commit 264b6ce
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/contrib/git/README.md b/contrib/git/README.md
@@ -235,6 +235,7 @@ you can answer `y` with no issue.
 <kbd>N</kbd>        | show previous commit
 <kbd>p</kbd>        | show previous commit
 <kbd>q</kbd>        | leave micro-state and git timemachine
+<kbd>Y</kbd>        | copy current commit hash
 
 ### Git gutter
 

diff --git a/contrib/git/packages.el b/contrib/git/packages.el
@@ -169,7 +169,7 @@ which require an initialization must be listed explicitly in the list.")
         ("p" git-timemachine-show-previous-revision)
         ("n" git-timemachine-show-next-revision)
         ("N" git-timemachine-show-previous-revision)
-        ("y" git-timemachine-kill-revision)
+        ("Y" git-timemachine-kill-revision)
         ("q" nil :exit t)))))
 
 ;; this mode is not up to date

diff --git a/core/core-configuration-layer.el b/core/core-configuration-layer.el
@@ -194,7 +194,7 @@ for that layer."
   "Declare the passed configuration LAYERS.
 LAYERS is a list of layer symbols."
   (reduce (lambda (acc elt) (push elt acc))
-          (mapcar 'configuration-layer//declare-layer layers)
+          (mapcar 'configuration-layer//declare-layer (reverse layers))
           :initial-value nil))
 
 (defun configuration-layer//declare-layer (layer)

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.64.0" "Spacemacs version.")
+(defconst spacemacs-version           "0.64.1" "Spacemacs version.")
 (defconst spacemacs-emacs-min-version   "24.3" "Minimal version of Emacs.")
 
 (defun spacemacs/emacs-version-ok ()