diff options
| author | Steve Purcell <steve@sanityinc.com> | 2017-03-18 15:24:49 +1300 |
|---|---|---|
| committer | David Shepherd <davidshepherd7@gmail.com> | 2017-03-19 15:37:40 +0000 |
| commit | 5d759db6713420ed4ab5c5cbef891871399ad25d (patch) | |
| tree | 7dd6d4d5cdf2edf2dfcf4890213d0f41763d0ddc /terminal-here.el | |
| parent | Simplify default terminal command and add missing defgroup (diff) | |
| download | emacs-terminal-here-5d759db6713420ed4ab5c5cbef891871399ad25d.tar.gz | |
Use a defcustom to control the project root function
Diffstat (limited to 'terminal-here.el')
| -rw-r--r-- | terminal-here.el | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/terminal-here.el b/terminal-here.el index ee23e92..26dabaf 100644 --- a/terminal-here.el +++ b/terminal-here.el @@ -4,7 +4,7 @@ ;; Author: David Shepherd <davidshepherd7@gmail.com> ;; Version: 0.1 -;; Package-Requires: ((emacs "24")) +;; Package-Requires: ((emacs "24") (cl-lib "0.5")) ;; Keywords: tools, frames ;; URL: https://github.com/davidshepherd7/terminal-here @@ -17,6 +17,7 @@ ;;; Code: +(require 'cl-lib) (defgroup terminal-here nil @@ -47,6 +48,18 @@ function taking a directory and returning such a list." :type '(choice (repeat string) (function))) +(defcustom terminal-here-project-root-function + (cl-find-if 'fboundp '(projectile-project-root vc-root-dir)) + "Function called to find the current project root directory. + +Good options include `projectile-project-root', which requires +you install the `projectile' package, or `vc-root-dir' which is +available in Emacs >= 25.1. + +The function should return nil or signal an error if the current +buffer is not in a project." + :group 'terminal-here + :type 'function) @@ -75,10 +88,12 @@ changed it by running `cd'." If projectile is installed the projectile root will be used, Otherwise `vc-root-dir' will be used." (interactive) - (terminal-here-launch-in-directory (cond - ((and (functionp 'projectile-project-root) (projectile-project-root))) - ((and (functionp 'vc-root-dir) (vc-root-dir))) - (t (signal 'user-error "Failed to detect project root, if you are in a version-controlled project try installing projectile or upgrading to emacs 25"))))) + (when (not terminal-here-project-root-function) + (signal 'user-error "No `terminal-here-project-root-function' is set.")) + (let ((root (funcall terminal-here-project-root-function))) + (when (not root) + (signal 'user-error "Not in any project according to `terminal-here-project-root-function'")) + (terminal-here-launch-in-directory root))) |