bug#64019: 29.0.91; Fix some tree-sitter :match regexps

[Basil Contovounesios]

Eli Zaretskii [2023-06-12 11:37 -0400] wrote:

>> Cc: 64019@debbugs.gnu.org
>> Date: Mon, 12 Jun 2023 16:10:31 +0100
>> From:  Basil Contovounesios via "Bug reports for GNU Emacs,
>>  the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
>> 
>> Mattias Engdegård [2023-06-12 16:48 +0200] wrote:
>> 
>> >> --- a/lisp/progmodes/c-ts-mode.el
>> >> +++ b/lisp/progmodes/c-ts-mode.el
>> >> @@ -1319,7 +1319,7 @@ c-ts-mode--c-or-c++-regexp
>> >>                "\\|" id "::"
>> >>                "\\|" id ws-maybe "=\\)"
>> >>                "\\|" "\\(?:inline" ws "\\)?namespace"
>> >> -              "\\(:?" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{"
>> >> +              "\\(?:" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{"
>> >
>> > If this one is wrong, then so is the regexp in cc-mode.el from this one 
>> > was copied, right?
>> 
>> Right, but I was going to suggest fixing that on master rather than
>> emacs-29, since it's been with us longer.
>
> I'd rather we fixed all non-trivial stuff like this on master.  We do
> want the pretest end at some point this year, don't we?

Yes please!  Are you referring to the whole patch, or is the rest of it
trivial enough for emacs-29?

Thanks,

-- 
Basil