From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 15 May 2023 15:39:49 +0000 (+0300)
Subject: ; Better warning message when loading tree-sitter fails
X-Git-Tag: emacs-29.0.92~142
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=33485fe8f74af0df458453c89afe4846ccd8e7e5;p=emacs.git

; 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.
---

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)