Merge from origin/emacs-29

717f8477284 ; Fix typo in js--treesit-imenu
c26fe45cb80 Fix treesit-query-capture
318bf42b410 Improve fontification of typescript-ts-mode (bug#59831)
64271bbb7d9 Add back pair feature in json-ts-mode fontification (bug#...
16b94888429 Fix mouse clicks on a non-selected frame
ca0da3b83df ; Clarify description of display on the margins

1 files changed, 7 insertions, 4 deletions

diff --git a/src/treesit.c b/src/treesit.c
index 4b150059fac..343054ed53e 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2507,14 +2507,17 @@ the query.  */)
   /* Set query range.  */
   if (!NILP (beg) && !NILP (end))
     {
-      EMACS_INT beg_byte = XFIXNUM (beg);
-      EMACS_INT end_byte = XFIXNUM (end);
+      EMACS_INT beg_byte = buf_charpos_to_bytepos (current_buffer,
+                                                   XFIXNUM (beg));
+      EMACS_INT end_byte = buf_charpos_to_bytepos (current_buffer,
+                                                   XFIXNUM (end));
       /* We never let tree-sitter run on buffers too large, so these
          assertion should never hit.  */
       eassert (beg_byte - visible_beg <= UINT32_MAX);
       eassert (end_byte - visible_beg <= UINT32_MAX);
-      ts_query_cursor_set_byte_range (cursor, (uint32_t) beg_byte - visible_beg,
-                                      (uint32_t) end_byte - visible_beg);
+      ts_query_cursor_set_byte_range (cursor,
+                                      (uint32_t) (beg_byte - visible_beg),
+                                      (uint32_t) (end_byte - visible_beg));
     }
 
   /* Execute query.  */