From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= Newsgroups: gmane.emacs.bugs Subject: bug#64019: 29.0.91; Fix some tree-sitter :match regexps Date: Mon, 12 Jun 2023 16:48:08 +0200 Message-ID: References: <87o7lkzrj1.fsf@epfl.ch> Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.120.0.1.15\)) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18065"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 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 16:49:18 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 1q8ir8-0004SD-Fb for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 12 Jun 2023 16:49:18 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8iqt-0004cz-9l; Mon, 12 Jun 2023 10:49:03 -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 1q8iqs-0004cq-E3 for bug-gnu-emacs@gnu.org; Mon, 12 Jun 2023 10:49: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 1q8iqs-0003xT-4l for bug-gnu-emacs@gnu.org; Mon, 12 Jun 2023 10:49:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q8iqr-0005bO-WB for bug-gnu-emacs@gnu.org; Mon, 12 Jun 2023 10:49:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <87o7lkzrj1.fsf@epfl.ch> Resent-From: Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 12 Jun 2023 14:49: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.168658129721370 (code B ref 64019); Mon, 12 Jun 2023 14:49:01 +0000 Original-Received: (at 64019) by debbugs.gnu.org; 12 Jun 2023 14:48:17 +0000 Original-Received: from localhost ([127.0.0.1]:40096 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8iq9-0005Ya-7T for submit@debbugs.gnu.org; Mon, 12 Jun 2023 10:48:17 -0400 Original-Received: from mail-lj1-f172.google.com ([209.85.208.172]:48557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8iq7-0005Xq-QS for 64019@debbugs.gnu.org; Mon, 12 Jun 2023 10:48:16 -0400 Original-Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2b1fe3a1a73so51241471fa.1 for <64019@debbugs.gnu.org>; Mon, 12 Jun 2023 07:48:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686581289; x=1689173289; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=ORt2bylCpqHI/7REl4zQinwnLQiGdxk0lZnyd3epOWY=; b=CLefYdc5qI5gnIHW1KuWoZUIaDdANjCuNYl3xeVPKGHHfGKH3suViLunV2+VT2aJIu axSslf2xItRGlwnnUQUSA9ZJb/JPVmzbUf8BggU885Ysa4CFfiEAAqrZVnAbgTBr6Qds eY1TGwpBNrkEil11VcnM1e1t5CV+hDZQAxL3wctNK61ksIgsoOdfNHIrAYvuT+NzAtRC xeus8jWeimKgb5NY7ag1h5wglM7CZVv31ltp0SFAeY90P2yF+pX4x8bNmDsdjXHjW4XK U/2GPElWHTAK329YeMocfYJ9CfQ2F+qcVT90Q19yUQyWE5IMelYU22Td24QlwJ7Zb18k ydgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686581289; x=1689173289; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ORt2bylCpqHI/7REl4zQinwnLQiGdxk0lZnyd3epOWY=; b=ChdC6J6jKylAoEcLEZTXs72Y1G9WBG08IJsk9Mmw5wlDzNPh9nK8+gtwawRvYrFCwZ Cw+rjOyT2Gwkpsj0sDErl00fuMzqHA146SNEWTzezRZ+aBu/f3HCCnmC5klvDcSzi8u+ JPYMNHqSjFcigL+4a/4NUaqlkXQJ8m5KMku4m9JemAAuJ8Yo6GHVzqxnaNFlmHRpgobC 52W0YpJMnopz7hWAAG0xkRlWYDPSofSat5n9fvshI/qi/+A6hv3P9XSkVQu5CUyqf3Lm S4+cjz7nZfgHi5Wb82JmbXuhIM1wTimYu6Muepb6rjpUc1ujp7U3gpYDjskDu+6kboN1 3Cbg== X-Gm-Message-State: AC+VfDwitZe5MoxdXg6FmSVH8oWz2fC/ecU6TIlP6MAsQ/rEWDqQIbJp 9BYXps3eb4DXuRwvvjZPgAQ= X-Google-Smtp-Source: ACHHUZ5hidyBRykO+xtZGZO7dXu/H4LudMm+SUO1yIm3R/QXhlyy3Cb7031BPO+L1g9yrHrYE5eXFw== X-Received: by 2002:a2e:9cd2:0:b0:2b2:1f2f:705f with SMTP id g18-20020a2e9cd2000000b002b21f2f705fmr2740773ljj.4.1686581289468; Mon, 12 Jun 2023 07:48:09 -0700 (PDT) Original-Received: from smtpclient.apple (c188-150-165-235.bredband.tele2.se. [188.150.165.235]) by smtp.gmail.com with ESMTPSA id n18-20020a2e86d2000000b002ada919a09asm1787194ljj.73.2023.06.12.07.48.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2023 07:48:09 -0700 (PDT) X-Mailer: Apple Mail (2.3654.120.0.1.15) 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:263279 Archived-At: > --- 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 one = was copied, right?