From c1927909af00febbb43accc6c0f68178d1e7a8cd Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 23 Dec 2015 03:47:31 -0500 Subject: [PATCH] Update neotree defuns --- core/lib/defuns-neotree.el | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/core/lib/defuns-neotree.el b/core/lib/defuns-neotree.el index 5e6afb059..96612a010 100644 --- a/core/lib/defuns-neotree.el +++ b/core/lib/defuns-neotree.el @@ -2,23 +2,17 @@ ;; for ../core-project.el ;;;###autoload -(defun narf/neotree-open (&optional dir) +(defun narf/neotree () + "Toggle the neotree window" (interactive) - (neotree-dir (or dir (narf/project-root)))) - -;;;###autoload -(defun narf/neotree-toggle () - (interactive) - (if (neo-global--window-exists-p) - (neotree-hide) - (narf/neotree-open))) - -;;;###autoload -(defun narf/neotree-find () - (interactive) - (unless (neo-global--window-exists-p) - (save-excursion (narf/neotree-open))) - (neotree-find)) + (let ((in-neotree (and (neo-global--window-exists-p) + (window-live-p neo-global--buffer) + (eq (current-buffer) neo-global--buffer)))) + (if in-neotree + (neotree-hide) + (unless (neo-global--window-exists-p) + (neotree-dir (narf/project-root))) + (neotree-find)))) ;;;###autoload (defun narf|neotree-close-on-window-change ()