diff options
Diffstat (limited to '.emacs.d')
| -rw-r--r-- | .emacs.d/lisp/init-project.el | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/.emacs.d/lisp/init-project.el b/.emacs.d/lisp/init-project.el index 66cf16b..4ef37d4 100644 --- a/.emacs.d/lisp/init-project.el +++ b/.emacs.d/lisp/init-project.el @@ -48,27 +48,21 @@ (add-to-list 'project-switch-commands '(?m "Magit" magit-status) t) (add-to-list 'project-switch-commands '(?q "Replace Regexp" project-query-replace-regexp) t) - ;; TODO remove this when happy with project-rootfile ;; project-root and project-try-local copied/modified from https://github.com/karthink/project-x/blob/master/project-x.el - ;; (cl-defmethod project-root ((project (head local))) - ;; "Return root directory of current PROJECT." - ;; (cdr project)) - ;; (defun project-try-local (dir) - ;; "Treat DIR as a project if it contains a .project file." - ;; (if-let ((root (locate-dominating-file dir ".project"))) - ;; (cons 'local root))) + (cl-defmethod project-root ((project (head local))) + "Return root directory of current PROJECT." + (cdr project)) + (defun project-try-local (dir) + "Treat DIR as a project if it contains a .project file." + (if-let ((root (locate-dominating-file dir ".project"))) + (cons 'local root))) ;; Add this hook last so so that vc takes precedence over local - ;;(add-hook 'project-find-functions 'project-try-local 90) + (add-hook 'project-find-functions 'project-try-local 90) :bind ("C-x p P" . project-switch-src-project) ("C-x p M-p" . project-switch-project) ("C-x f" . project-recentf)) -(use-package project-rootfile - :after project - :config - (add-to-list 'project-find-functions #'project-rootfile-try-detect t)) - (use-package perspective ;; Don't restart persp-mode when re-evaluating, as it clears the current persp list :init (or persp-mode (persp-mode)) |