From: Yuan Fu <casouri@gmail.com>
Date: Sun, 28 Jan 2024 06:03:28 +0000 (-0800)
Subject: Fix treesit-range-rules
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc6a65ef9c9358b36ba025e496026c6e5258671a;p=emacs.git

Fix treesit-range-rules

* lisp/treesit.el (treesit-range-rules): Reset :local like other
keywords.  The other chunk is indentation fix.

(cherry picked from commit 236317e5d2284399d6ca0413ea2a29b84270d545)
---

diff --git a/lisp/treesit.el b/lisp/treesit.el
index d1e0beaaac9..96222ed81cb 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -595,8 +595,8 @@ that encompasses the region between START and END."
                    (unless (and (consp range-offset)
                                 (numberp (car range-offset))
                                 (numberp (cdr range-offset)))
-                    (signal 'treesit-error (list "Value of :offset option should be a pair of numbers" range-offset)))
-                  (setq offset range-offset)))
+                     (signal 'treesit-error (list "Value of :offset option should be a pair of numbers" range-offset)))
+                   (setq offset range-offset)))
         (query (if (functionp query)
                    (push (list query nil nil) result)
                  (when (null embed)
@@ -606,7 +606,7 @@ that encompasses the region between START and END."
                  (push (list (treesit-query-compile host query)
                              embed local offset)
                        result))
-               (setq host nil embed nil offset nil))))
+               (setq host nil embed nil offset nil local nil))))
     (nreverse result)))
 
 (defun treesit--merge-ranges (old-ranges new-ranges start end)