From: Stefan Kangas <stefankangas@gmail.com>
Date: Thu, 29 Dec 2022 05:30:09 +0000 (+0100)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d9d90666f545dc25be63c1b16c030ce1aa96510e;p=emacs.git

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
---

d9d90666f545dc25be63c1b16c030ce1aa96510e
diff --cc lisp/progmodes/c-ts-mode.el
index 73e488a8058,8ba6cdee42d..12e021bc670
--- a/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))