From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#64019: 29.0.91; Fix some tree-sitter :match regexps Date: Mon, 12 Jun 2023 18:37:56 +0300 Message-ID: <835y7sy9m3.fsf@gnu.org> References: <87352w4syg.fsf@epfl.ch> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40243"; mail-complaints-to="usenet@ciao.gmane.io" Cc: mattias.engdegard@gmail.com, 64019@debbugs.gnu.org To: Basil Contovounesios Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jun 12 17:38:34 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q8jcn-000AJG-PU for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 12 Jun 2023 17:38:33 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8jcK-0004uY-Cw; Mon, 12 Jun 2023 11:38:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q8jcI-0004to-BC for bug-gnu-emacs@gnu.org; Mon, 12 Jun 2023 11:38:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8jcI-0003NQ-1q for bug-gnu-emacs@gnu.org; Mon, 12 Jun 2023 11:38:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q8jcH-0006yq-UN for bug-gnu-emacs@gnu.org; Mon, 12 Jun 2023 11:38:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 12 Jun 2023 15:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64019 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 64019-submit@debbugs.gnu.org id=B64019.168658427226810 (code B ref 64019); Mon, 12 Jun 2023 15:38:01 +0000 Original-Received: (at 64019) by debbugs.gnu.org; 12 Jun 2023 15:37:52 +0000 Original-Received: from localhost ([127.0.0.1]:40335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8jc7-0006yL-WE for submit@debbugs.gnu.org; Mon, 12 Jun 2023 11:37:52 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:59496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8jc5-0006y0-Fu for 64019@debbugs.gnu.org; Mon, 12 Jun 2023 11:37:50 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q8jbx-0003B6-Hb; Mon, 12 Jun 2023 11:37:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=XE+upmbticPYYl/paZ1iPtQ7i3oxA7l2AmV7UG+eURI=; b=EA6vtuGZvq9SWCDQKFHL b4NPPfKslOYk/Kdz2WT7IsUycZNsimCJZ6x7bIFxlrC6nI672VYH61K5JvjuZTILw//Pf5Pg0EQU2 9i7Xa8gnAYazFTimwRVokhdgdRtYhm7ZRgnGD94dEJwZYAQDGTOzJhJzlQRM/ueGrrCSPSNn9GQAy /nEkFnUGTVvlftNJbuG6sQ4Rt+uBzwFoYr0HIOuUENePkfn8+EhTE1qTfdmF9Wuct7VWOF1g0HJ7Q i+QjLiXGPZHiihicI9EoqgrqpQjKvooDvi8LvesogW7ajUS5psC941pk1ZRLQY0mriO3oepj/J4ci 8qVtEhQak5NucA==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q8jbw-0002fk-T5; Mon, 12 Jun 2023 11:37:41 -0400 In-Reply-To: <87352w4syg.fsf@epfl.ch> (bug-gnu-emacs@gnu.org) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:263283 Archived-At: > 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" > > 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?