From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Basil Contovounesios via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#64019: 29.0.91; Fix some tree-sitter :match regexps Date: Mon, 12 Jun 2023 21:22:09 +0100 Message-ID: <877cs8whvy.fsf@epfl.ch> References: <87352w4syg.fsf@epfl.ch> <835y7sy9m3.fsf@gnu.org> Reply-To: Basil Contovounesios Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="16141"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: mattias.engdegard@gmail.com, 64019@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jun 12 22:23:37 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 1q8o4f-0003xc-N5 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 12 Jun 2023 22:23:37 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8o4C-0002Wn-7z; Mon, 12 Jun 2023 16:23:08 -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 1q8o47-0002WB-53 for bug-gnu-emacs@gnu.org; Mon, 12 Jun 2023 16:23:03 -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 1q8o46-0007mt-QP for bug-gnu-emacs@gnu.org; Mon, 12 Jun 2023 16:23:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q8o46-0000JD-HE for bug-gnu-emacs@gnu.org; Mon, 12 Jun 2023 16:23:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Basil Contovounesios Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 12 Jun 2023 20:23:02 +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.16866013411098 (code B ref 64019); Mon, 12 Jun 2023 20:23:02 +0000 Original-Received: (at 64019) by debbugs.gnu.org; 12 Jun 2023 20:22:21 +0000 Original-Received: from localhost ([127.0.0.1]:40736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8o3Q-0000He-UQ for submit@debbugs.gnu.org; Mon, 12 Jun 2023 16:22:21 -0400 Original-Received: from mail-wm1-f41.google.com ([209.85.128.41]:62934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8o3N-0000HG-Bm for 64019@debbugs.gnu.org; Mon, 12 Jun 2023 16:22:20 -0400 Original-Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-3f7ff69824dso31242215e9.1 for <64019@debbugs.gnu.org>; Mon, 12 Jun 2023 13:22:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd.ie; s=google21; t=1686601331; x=1689193331; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EiYPGZM207zzsX+4poZz5RKw1+LOmy6gLENOVCzwOfA=; b=XiTuMHF4CDdWJqbLDB9TZ8Rf41kTQekC241iifkBmsWFfkZUhBVsP90Q7ot60YfuVj rqDl0Vxa1NVqVhOMubVQqe40BY3MvWmmw5zmfbVWMajG6QTbujVqobjkTcO8e7Eha5AG pgd7I7nj6Bba+gYbhQ1pmuAsCfAzr7y0ydWSaJuJd4TTtdaDYJC4kw9K4vnLObWTNMTH W81IWpjeqVqE+6usrwMCNqH+pD5bah+SVK/L/287xgCjErt5ISH3IO9Rx+q1NtRq/neL BY9Mcv6DMcaD9/Ev6+lnn9ZC7njgn0u0s5ARavjYA5ifyoC8yuGHTVfxjBT/khFyzWY+ teQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686601331; x=1689193331; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=EiYPGZM207zzsX+4poZz5RKw1+LOmy6gLENOVCzwOfA=; b=CAQBoRTUAp/3fzU2j92Of4hyMMlw540mf5h9okdTr9/fBGkGfs7oiQN3FP40vacor1 +3rJFL5Ku+TvFZaHdXAqB3RaZqbsAQt0Y4139hsedPb/RtLFJwq5JMy197LZb2msqGOc pkONDbqW2O/Z0xtxc/T0klYiQ6Zpgxl2Ck1ZP6kntM3JR0wthamo82v0jM1j1g6Aen8X hhX2dJQMW2+POK2uUWoTeofubDInhxbotQbrqbJEZOJRs120yyp0BT/nEy73dGtELkN2 yfhhk3ZT/1s3nhR5lCtazpu3eslNXvD57+tgaMghui/iJihI3uHem6azorVoYPcVk8HI v8Zg== X-Gm-Message-State: AC+VfDyHHBC/dMOg2LGuZResh8+6qkZH+1cX20kKWZ2FS6gZDSqWlGjF liuYemQfy6vwPBf39WRzM1cgNQ== X-Google-Smtp-Source: ACHHUZ4xlMKizsa8dFk/dNIu7E1CCLMeiPmTPhKJFphz8Gizue6RPTmkFYZaVqYncxRq3fJK/yFq1g== X-Received: by 2002:adf:ef8b:0:b0:30f:bde3:aa6 with SMTP id d11-20020adfef8b000000b0030fbde30aa6mr3639143wro.15.1686601331348; Mon, 12 Jun 2023 13:22:11 -0700 (PDT) Original-Received: from localhost ([109.78.39.245]) by smtp.gmail.com with ESMTPSA id b14-20020a056000054e00b0030c2e3c7fb3sm13198373wrf.101.2023.06.12.13.22.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 13:22:10 -0700 (PDT) In-Reply-To: <835y7sy9m3.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 12 Jun 2023 11:37:44 -0400") 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:263295 Archived-At: 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" >>=20 >> Mattias Engdeg=C3=A5rd [2023-06-12 16:48 +0200] wrote: >>=20 >> >> --- 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 "=3D\\)" >> >> "\\|" "\\(?: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 on= e was copied, right? >>=20 >> 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, --=20 Basil