summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2023-05-15 18:39:49 +0300
committerEli Zaretskii <eliz@gnu.org>2023-05-15 18:39:49 +0300
commit33485fe8f74af0df458453c89afe4846ccd8e7e5 (patch)
tree20d3d014c3eeb3abd12912e327685976a245ddd8
parent95a724abaaca40e3fbad69593cb9fab39a249742 (diff)
downloademacs-33485fe8f74af0df458453c89afe4846ccd8e7e5.tar.gz
; Better warning message when loading tree-sitter fails
* lisp/treesit.el (treesit-ready-p): Improve diagnostics on MS-Windows when the tree-sitter library cannot be loaded at run time.
-rw-r--r--lisp/treesit.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 147b052d287..d7502560fea 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -2300,7 +2300,10 @@ instead of emitting a warning."
;; Check for each condition and set MSG.
(catch 'term
(when (not (treesit-available-p))
- (setq msg "tree-sitter library is not compiled with Emacs")
+ (setq msg (if (fboundp 'treesit-node-p)
+ ;; Windows loads tree-sitter dynakically.
+ "tree-sitter library is not available or failed to load"
+ "Emacs is not compiled with tree-sitter library"))
(throw 'term nil))
(when (> (position-bytes (max (point-min) (1- (point-max))))
treesit-max-buffer-size)