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

Make neotree cooperate with popups and other window-changing actions

Browse source
This commit is contained in:
Henrik Lissner 2017-01-08 15:35:50 -05:00
parent ea2372f025
commit f376006284
3 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/core-popup.el
View file

@ -55,8 +55,20 @@
;; There is no shackle-popup hook, so I created one: ;; There is no shackle-popup hook, so I created one:
(advice-add 'shackle-display-buffer :around 'doom*popup-init) (advice-add 'shackle-display-buffer :around 'doom*popup-init)
;; Tell these functions not to mess with popups: ;; Tell these functions not to mess with popups:
(advice-add 'balance-windows :around 'doom*save-neotree)
(advice-add 'balance-windows :around 'doom*save-popup) (advice-add 'balance-windows :around 'doom*save-popup)
(advice-add 'doom/evil-window-move :around 'doom*save-popup)) (advice-add 'doom/evil-window-move :around 'doom*save-popup)
(advice-add 'evil-window-move-very-bottom :around 'doom*save-popup)
(advice-add 'evil-window-move-very-top :around 'doom*save-popup)
(advice-add 'evil-window-move-far-left :around 'doom*save-popup)
(advice-add 'evil-window-move-far-right :around 'doom*save-popup)
(advice-add 'evil-window-move-very-bottom :around 'doom*save-neotree)
(advice-add 'evil-window-move-very-top :around 'doom*save-neotree)
(advice-add 'evil-window-move-far-left :around 'doom*save-neotree)
(advice-add 'evil-window-move-far-right :around 'doom*save-neotree)
)
;; ;;

5
core/core-project.el
View file

@ -60,13 +60,14 @@
(advice-add 'neotree-create-node :around 'doom*neotree-create-node) (advice-add 'neotree-create-node :around 'doom*neotree-create-node)
;; Prevents messing up the neotree buffer on window changes ;; Prevents messing up the neotree buffer on window changes
(advice-add 'doom/evil-window-move :around 'doom*save-neotree) (advice-add 'doom/evil-window-move :around 'doom*save-neotree)
(advice-add 'doom/popup-buffer :around 'doom*save-neotree)
;; Adding keybindings to `neotree-mode-map' wouldn't work for me (they get ;; Adding keybindings to `neotree-mode-map' wouldn't work for me (they get
;; overridden when the neotree buffer is spawned). So we bind them in a hook. ;; overridden when the neotree buffer is spawned). So we bind them in a hook.
(add-hook 'neo-after-create-hook 'doom|neotree-init-keymap) (add-hook 'neo-after-create-hook 'doom|neotree-init-keymap)
(defun doom|neotree-init-keymap (&rest _) (defun doom|neotree-init-keymap (&rest _)
(map! :Lm "\\\\" 'evil-window-prev (map! :Lm "\\\\" 'evil-window-prev
:Lm "ESC ESC" 'neotree-hide :Lm "ESC ESC" 'doom/neotree-close
:Lm "q" 'neotree-hide :Lm "q" 'doom/neotree-close
:Lm [return] 'neotree-enter :Lm [return] 'neotree-enter
:Lm "RET" 'neotree-enter :Lm "RET" 'neotree-enter
:Lm "<return>" 'neotree-enter :Lm "<return>" 'neotree-enter

9
core/defuns/defuns-neotree.el
View file

@ -17,10 +17,17 @@
(neotree-dir project-root)) (neotree-dir project-root))
(neotree-find path project-root))))) (neotree-find path project-root)))))
;;;###autoload
(defun doom/neotree-close ()
(interactive)
(when (neo-global--window-exists-p)
(with-selected-window neo-global--window
(evil-window-delete))))
;;;###autoload ;;;###autoload
(defmacro doom/neotree-save (&rest body) (defmacro doom/neotree-save (&rest body)
`(let ((neo-p (neo-global--window-exists-p))) `(let ((neo-p (neo-global--window-exists-p)))
(when neo-p (neotree-hide)) (when neo-p (doom/neotree-close))
,@body ,@body
(when neo-p (when neo-p
(save-selected-window (save-selected-window