Merge branch 'develop' (0.42.0)

Override previous 0.42.0 commit
syl20bnr · Jan 4, 2015 · 295a42a · 295a42a
2 parents 73a2938 + 774d1ce
commit 295a42a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/core/spacemacs-mode.el b/core/spacemacs-mode.el
@@ -4,7 +4,7 @@
 (require 'subr-x nil 'noerror)
 (require 'emacs-backports)
 
-(defconst spacemacs-version "0.41.2"
+(defconst spacemacs-version "0.42.0"
   "Spacemacs version.")
 
 (defconst spacemacs-min-version "24.3"

diff --git a/doc/DOCUMENTATION.md b/doc/DOCUMENTATION.md
@@ -1171,7 +1171,7 @@ experience like in [ranger][]:
 
 Key Binding                      |                 Description
 ---------------------------------|----------------------------------------------------------------
-<kbd>h</kbd>                     | collapse directory
+<kbd>h</kbd>                     | collapse expanded directory or go to parent node
 <kbd>H</kbd>                     | previous sibling
 <kbd>j</kbd>                     | next file or directory
 <kbd>J</kbd>                     | next expanded directory on level down

diff --git a/spacemacs/packages.el b/spacemacs/packages.el
@@ -778,13 +778,13 @@ determine the state to enable when escaping from the insert state.")
 
 (defun spacemacs/init-evil-tutor ()
   (use-package evil-tutor
-    :commands (evil-tutor/start
-               evil-tutor/resume)
+    :commands (evil-tutor-start
+               evil-tutor-resume)
     :init
     (progn
       (setq evil-tutor-working-directory
             (concat spacemacs-cache-directory ".tutor/"))
-      (evil-leader/set-key "hT" 'evil-tutor/start))))
+      (evil-leader/set-key "hT" 'evil-tutor-start))))
 
 (defun spacemacs/init-evil-visualstar ()
   (use-package evil-visualstar
@@ -1468,6 +1468,17 @@ determine the state to enable when escaping from the insert state.")
             (when neo-auto-indent-point
               (neo-point-auto-indent)))))
 
+      (defun spacemacs/neotree-collapse-or-up ()
+        "Collapse an expanded directory node or go to the parent node."
+        (interactive)
+        (let ((node (neo-buffer--get-filename-current-line)))
+          (when node
+            (if (file-directory-p node)
+                (if (neo-buffer--expanded-node-p node)
+                    (spacemacs/neotree-collapse)
+                  (neotree-select-up-node))
+              (neotree-select-up-node)))))
+
       (defun spacemacs//neotree-key-bindings ()
         "Set the key bindings for a neotree buffer."
         (define-key evil-motion-state-local-map (kbd "TAB") 'neotree-stretch-toggle)
@@ -1478,7 +1489,7 @@ determine the state to enable when escaping from the insert state.")
         (define-key evil-motion-state-local-map (kbd "c")   'neotree-create-node)
         (define-key evil-motion-state-local-map (kbd "d")   'neotree-delete-node)
         (define-key evil-motion-state-local-map (kbd "g")   'neotree-refresh)
-        (define-key evil-motion-state-local-map (kbd "h")   'spacemacs/neotree-collapse)
+        (define-key evil-motion-state-local-map (kbd "h")   'spacemacs/neotree-collapse-or-up)
         (define-key evil-motion-state-local-map (kbd "H")   'neotree-select-previous-sibling-node)
         (define-key evil-motion-state-local-map (kbd "J")   'neotree-select-down-node)
         (define-key evil-motion-state-local-map (kbd "K")   'neotree-select-up-node)