From a72df328a1195328a364be20612be189eb2dfd59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Augustin=20Ch=C3=A9neau?= Date: Wed, 20 Sep 2023 12:23:22 +0200 Subject: [PATCH 2/3] Fix tree-sitter indentation conflict with multiple languages --- lisp/treesit.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/treesit.el b/lisp/treesit.el index f0d6f32b421..0bb3aa6d653 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -1684,8 +1684,8 @@ treesit--indent-1 bol (car local-parsers))) ((eq 1 (length (treesit-parser-list nil nil t))) (treesit-node-at bol)) - ((treesit-language-at (point)) - (treesit-node-at bol (treesit-language-at (point)))) + ((treesit-language-at bol) + (treesit-node-at bol (treesit-language-at bol))) (t (treesit-node-at bol)))) (root (treesit-parser-root-node (treesit-node-parser smallest-node))) -- 2.42.0