branch: externals/vc-jj
commit 4370fc9a49319319ad269bf77e51bd147a27190c
Author: Wojciech Siewierski <wojci...@siewierski.eu>
Commit: Wojciech Siewierski <wojci...@siewierski.eu>
Check for the presence of the jj executable
---
vc-jj.el | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/vc-jj.el b/vc-jj.el
index 55b0cf63d5..8b8578e4cd 100644
--- a/vc-jj.el
+++ b/vc-jj.el
@@ -47,18 +47,20 @@
;;;###autoload (defun vc-jj-registered (file)
;;;###autoload "Return non-nil if FILE is registered with jj."
-;;;###autoload (if (vc-find-root file ".jj") ; Short cut.
+;;;###autoload (if (and (vc-find-root file ".jj") ; Short cut.
+;;;###autoload (executable-find "jj"))
;;;###autoload (progn
;;;###autoload (load "vc-jj" nil t)
;;;###autoload (vc-jj-registered file))))
(defun vc-jj-registered (file)
- (unless (not (file-exists-p default-directory))
- (with-demoted-errors "Error: %S"
- (when-let ((root (vc-jj-root file)))
- (let ((relative (file-relative-name file root))
- (default-directory root))
- (vc-jj--file-tracked relative))))))
+ (when (executable-find "jj")
+ (unless (not (file-exists-p default-directory))
+ (with-demoted-errors "Error: %S"
+ (when-let ((root (vc-jj-root file)))
+ (let ((relative (file-relative-name file root))
+ (default-directory root))
+ (vc-jj--file-tracked relative)))))))
(defun vc-jj-state (file)
(when-let ((root (vc-jj-root file)))
