branch: externals/matlab-mode
commit 5a6628f5d7410e55cc8354c514d3b9c084b382ff
Author: Nobuto Kaitoh <[email protected]>
Commit: Nobuto Kaitoh <[email protected]>
Fix matlab--ts-grammar-check-version ABI check and user-error call
Fixes #70
- Use treesit-library-abi-version with minimal=t for correct ABI comparison
- Use inequality (>) instead of equality (=) to accept newer-ABI grammars
- Fix user-error call: single format string with ts-abi-min-compatible-ver
and release-abi-ver
---
matlab-ts-grammar-install.el | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/matlab-ts-grammar-install.el b/matlab-ts-grammar-install.el
index 364d8c761b..388519efa4 100644
--- a/matlab-ts-grammar-install.el
+++ b/matlab-ts-grammar-install.el
@@ -35,15 +35,16 @@
(when (< emacs-major-version 30)
(user-error "Unsupported Emacs version, %d" emacs-major-version))
- (let ((ts-abi-ver (treesit-library-abi-version))
+ (let ((ts-abi-min-compatible-ver (treesit-library-abi-version t))
(release-abi-ver (if (string-match "\\`matlab-ts-abi\\([0-9]+\\)-"
matlab--ts-grammar-release)
(string-to-number (match-string 1
matlab--ts-grammar-release))
(error "Unexpected matlab--ts-grammar-release %s"
matlab--ts-grammar-release))))
- (when (not (= ts-abi-ver release-abi-ver))
- (user-error "Emacs treesit-library-abi-version is %d and the matlab-ts
grammar version "
- "is %d, which indicates a new build is required for
matlab-ts"))))
+ (when (> ts-abi-min-compatible-ver release-abi-ver)
+ (user-error
+ "Emacs oldest compatible treesit ABI version is %d and the matlab-ts
grammar version is %d,\
+ which indicates a new build is required for matlab-ts"
ts-abi-min-compatible-ver release-abi-ver))))
(defun matlab--ts-get-grammar-branch-and-install-dir (prompt)
"Get branch and tree-sitter install directory.
