Merge from origin/emacs-29

909091d7578 ; Minor cleanup for tree-sitter font-lock rules in js-ts-...
e78e69b3318 Clean up font-lock rules in js-ts-mode
0a61e4e2b71 ; * doc/lispref/parsing.texi (Using Parser): Minor improv...
398ed75c276 ; * lisp/progmodes/c-ts-mode.el (c-ts-mode--fill-paragrap...
19b8733aa27 Fix syntax for < and > in c++-ts-mode (bug#60351)
f509246ba12 Call tree-sitter parser notifier on the first parse
ec6feeaa191 Fix tree-sitter parser notifier recursion

diff --cc lisp/progmodes/c-ts-mode.el
index 73e488a8058b81f7854aaf6b9658c0452c99072b,8ba6cdee42deabc09987ac58c93c3314879aa98c..12e021bc670f4c80bb522ec0ebc1a3a40ccf19ba
--- 1/lisp/progmodes/c-ts-mode.el
--- 2/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@@ -756,11 -782,9 +782,13 @@@ Set up
    (unless (treesit-ready-p 'cpp)
      (error "Tree-sitter for C++ isn't available"))
  
 +  (setq-local treesit-text-type-regexp
 +              (regexp-opt '("comment"
 +                            "raw_string_literal")))
 +
    (treesit-parser-create 'cpp)
+   (setq-local syntax-propertize-function
+               #'c-ts-mode--syntax-propertize)
  
    (setq-local treesit-simple-indent-rules
                (c-ts-mode--set-indent-style 'cpp))

diff --cc lisp/progmodes/js.el
Simple merge