emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert 5c46a5e68 & fix treemacs-evil load order

Browse source 
I misunderstood the purpose of the new keybinds. They are actually fine.

Also fixes the config load order for treemacs-evil caused by weird
use-package + :after semantics.

Closes #5056
This commit is contained in:
Henrik Lissner 2021-05-15 17:33:04 -04:00
parent 4d0ac5f46c
commit b9e0ee2954
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/ui/treemacs/config.el
View file

@ -51,7 +51,8 @@ This must be set before `treemacs' has loaded.")
(use-package! treemacs-evil (use-package! treemacs-evil
:when (featurep! :editor evil +everywhere) :when (featurep! :editor evil +everywhere)
:after treemacs :defer t
:init (after! treemacs (require 'treemacs-evil))
:config :config
(define-key! evil-treemacs-state-map (define-key! evil-treemacs-state-map
[return] #'treemacs-RET-action [return] #'treemacs-RET-action
@ -60,12 +61,7 @@ This must be set before `treemacs' has loaded.")
;; REVIEW Fix #1875 to be consistent with C-w {v,s}, but this should really ;; REVIEW Fix #1875 to be consistent with C-w {v,s}, but this should really
;; be considered upstream. ;; be considered upstream.
"o v" #'treemacs-visit-node-horizontal-split "o v" #'treemacs-visit-node-horizontal-split
"o s" #'treemacs-visit-node-vertical-split "o s" #'treemacs-visit-node-vertical-split))
;; REVIEW Fix #5056: treemacs-evil changed h/l to close/open folds, which is
;; substantially less useful than traversing up/down the tree,
;; especially when TAB already exists for toggle folds.
"h" #'treemacs-root-up
"l" #'treemacs-root-down))
(use-package! treemacs-projectile (use-package! treemacs-projectile