From f152f5fe7951f860afa5389a9deb0f6bf4b0860e Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Fri, 22 Dec 2017 16:54:31 +0000 Subject: [PATCH] Update neotree setup so C-x p always moves focus to neotree --- modules/siren-neotree.el | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/siren-neotree.el b/modules/siren-neotree.el index 7e66cb4..03259e0 100644 --- a/modules/siren-neotree.el +++ b/modules/siren-neotree.el @@ -11,11 +11,22 @@ (use-package neotree :bind ("C-x C-p" . neotree-toggle) - ("C-x p" . neotree-project-dir-toggle) + ("C-x p" . neotree-project-dir) :init - (defun neotree-project-dir-toggle () + (defun neotree-project-dir () "Open NeoTree using the project root, using find-file-in-project, +or the current buffer directory." + (interactive) + (let ((project-dir (ignore-errors (projectile-project-root))) + (file-name (buffer-file-name)) + (neo-smart-open nil)) + (neotree-show) + (if project-dir (neotree-dir project-dir)) + (if file-name (neotree-find file-name)))) + + (defun neotree-project-dir-toggle () + "Toggle opening NeoTree using the project root, using find-file-in-project, or the current buffer directory." (interactive) (let ((project-dir (ignore-errors (projectile-project-root)))