Merge branch 'develop' (v0.3.2)

syl20bnr · Nov 2, 2014 · 80217fb · 80217fb
2 parents 6c8b5f1 + 1d855c5
commit 80217fb
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/spacemacs/packages.el b/spacemacs/packages.el
@@ -314,9 +314,11 @@ DELETE-FUNC when calling CALLBACK.
              (spacemacs/escape-state ',seq ',shadowed nil nil 'evil-exit-visual-state)))
         (define-key evil-motion-state-map key
           `(lambda () (interactive)
-             (let ((exit-func (if (eq 'help-mode major-mode)
-                                  'quit-window
-                                'evil-normal-state)))
+             (let ((exit-func (cond ((eq 'help-mode major-mode)
+                                     'quit-window)
+                                    ((eq 'neotree-mode major-mode)
+                                     'neotree-hide)
+                                    (t 'evil-normal-state))))
                (spacemacs/escape-state ',seq ',shadowed nil nil exit-func))))
         (eval-after-load 'evil-lisp-state
           `(define-key evil-lisp-state-map ,key
@@ -1188,6 +1190,7 @@ DELETE-FUNC when calling CALLBACK.
             (spacemacs/no-golden-ratio-for-buffers " *popwin-dummy*")))
       (add-to-list 'golden-ratio-inhibit-functions
                    'spacemacs/no-golden-ratio-guide-key)
+      (add-to-list 'golden-ratio-exclude-buffer-names " *NeoTree*")
 
       (spacemacs//diminish golden-ratio-mode " ⊞"))))
 
@@ -1532,6 +1535,7 @@ DELETE-FUNC when calling CALLBACK.
     :defer t
     :init
     (progn
+      (add-to-list 'evil-motion-state-modes 'neotree-mode)
       (setq neo-create-file-auto-open t
             neo-dont-be-alone t
             neo-banner-message "File Tree browser"