From: Yuan Fu <casouri@gmail.com>
Date: Tue, 9 Apr 2024 04:07:11 +0000 (-0700)
Subject: Fix c++-ts-mode defun navigation (bug#65885)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f588ea8b22f5fcf433ba4d49a88b77e7286e275;p=emacs.git

Fix c++-ts-mode defun navigation (bug#65885)

* lisp/progmodes/c-ts-mode.el (c-ts-base-mode): Add BOL and EOL marker
in the regexp.

(cherry picked from commit 407e85ce139c2f0ab8bc7f9643ee7506a4e561a1)
---

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 3a89f0f494b..ce2deb8f6a6 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -1207,10 +1207,10 @@ BEG and END are described in `treesit-range-rules'."
                                    "struct_specifier"
                                    "enum_specifier"
                                    "union_specifier"
-                                   "class_specifier"
-                                   "namespace_definition"
-                                   "preproc_def"
-                                   "preproc_function_def")
+                                   ;; Make sure this doesn't match
+                                   ;; storage_class_specifier.
+                                   "^class_specifier$"
+                                   "namespace_definition")
                                  (and c-ts-mode-emacs-sources-support
                                       '(;; DEFUN.
                                         "expression_statement"