From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?Q?=D0=99=D0=BE=D1=80=D0=B4=D0=B0=D0=BD_?= =?UTF-8?Q?=D0=9C=D0=B8=D0=BB=D0=B0=D0=B4=D0=B8=D0=BD=D0=BE=D0=B2?= Newsgroups: gmane.emacs.bugs Subject: bug#63708: 29.0.60; rust-ts-mode not properly handling apostrophe Date: Mon, 29 May 2023 14:54:15 +0000 Message-ID: References: <8T8C4l5XryyVmB2cBTnmhGMnoELwHA2y1u1ZeMlg1WaQKzrPeOoe6L5hOQq3JPdsnG9r-puSlQfNZ091qBCGpVco-mC6ruhsQs0SvaPjkjQ=@proton.me> <_LWjNGLzmmtpm2gEwOaBZlTVCwvU9yxUyJzIl3yo3ol48dKWbMabBOpLzZ2UhWJ2_yPjVT-j2Jb-oUP8nLaju6ztGjFTNq-2PZqgTjv5gSM=@proton.me> <83r0qzgwtb.fsf@gnu.org> <83edmzgqm9.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_9pJJG7euvhrYBbdIvP5HoteUuWaQ545YgiPP9sQSpE" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37579"; mail-complaints-to="usenet@ciao.gmane.io" Cc: dev@rjt.dev, casouri@gmail.com, 63708@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon May 29 16:55:15 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 1q3eHD-0009VJ-NK for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 29 May 2023 16:55:15 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3eH9-000646-63; Mon, 29 May 2023 10:55:11 -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 1q3eH2-00063x-0m for bug-gnu-emacs@gnu.org; Mon, 29 May 2023 10:55:04 -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 1q3eH0-0005zh-5L for bug-gnu-emacs@gnu.org; Mon, 29 May 2023 10:55:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3eH0-0001ij-1Y for bug-gnu-emacs@gnu.org; Mon, 29 May 2023 10:55:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?=D0=99=D0=BE=D1=80=D0=B4=D0=B0=D0=BD_?= =?UTF-8?Q?=D0=9C=D0=B8=D0=BB=D0=B0=D0=B4=D0=B8=D0=BD=D0=BE=D0=B2?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 29 May 2023 14:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63708 X-GNU-PR-Package: emacs Original-Received: via spool by 63708-submit@debbugs.gnu.org id=B63708.16853720726557 (code B ref 63708); Mon, 29 May 2023 14:55:01 +0000 Original-Received: (at 63708) by debbugs.gnu.org; 29 May 2023 14:54:32 +0000 Original-Received: from localhost ([127.0.0.1]:58864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3eGW-0001hh-3k for submit@debbugs.gnu.org; Mon, 29 May 2023 10:54:32 -0400 Original-Received: from mail-40141.protonmail.ch ([185.70.40.141]:26043) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3eGT-0001hR-Ti for 63708@debbugs.gnu.org; Mon, 29 May 2023 10:54:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=4txunbqkjzb2ljuplq5kgsubxi.protonmail; t=1685372063; x=1685631263; bh=pPow85o53PO5p0+riyNxJIhF/KVXsSd3OHpcpSqyc78=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=YrbL8LN1hLWzXeYlwYHlZ9dQzFRfTx5/lGTd2psvhzgGBS6VQCQMWIz6bu4wxMDIe dd5IKLO/A5Sa8pMdqqD4Sks/FJWNQPwAGfaRWaek8JLlu5LUOh2mSmuJij56shtjxR otmqPYrxT7Ws5T0PZEM0/IG7iLCB8lGH8vbCgi9zaoWxAkSMUf4mdnt4Lk4BdtJ4iC nbMm5OFGD2gKq+mPM6OCPUeTcD6O5A8K7H+mKwpwnaQ9UrUanUqS2zTF2ll7Lx7sL9 E1o+2eUr42G8T2AQrtsnT59bBOSjiktz5f/eLtMlxFK48Y4PaNcft6GVTM0Z7sJRYR +0ePe/vyoWoZw== In-Reply-To: <83edmzgqm9.fsf@gnu.org> Feedback-ID: 46506384:user:proton 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:262588 Archived-At: This is a multi-part message in MIME format. --b1_9pJJG7euvhrYBbdIvP5HoteUuWaQ545YgiPP9sQSpE Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Here's a patch that takes into account both your and Randy's remarks. It fi= xes both rust-ts-mode and go-ts-mode in a total of 15 lines. $ git diff --stat HEAD~ HEAD lisp/progmodes/go-ts-mode.el | 1 + lisp/progmodes/rust-ts-mode.el | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) If that doesn't work as well, I don't mind Randy re-implementing and commit= ting the fixes. On Monday, May 29th, 2023 at 5:26 PM, Eli Zaretskii wrote: > I see in the discussion of that commit (bug#10893) you say you > submitted the copyright assignment form, but I don't see your > assignment on file. Did the process ever end, and if so, do you have > somewhere the signed PDF file of your assignment, which you are > supposed to receive when the process ends? If I remember correctly, I sent the agreement over the post, but I never re= ceived any confirmation or response. As for the scanned PDF, it's long lost= , I believe. If you agree, I can sign a new one, complete the procedure and then examine= all ts-modes for the same bug. Cheers! YM --b1_9pJJG7euvhrYBbdIvP5HoteUuWaQ545YgiPP9sQSpE Content-Type: application/octet-stream; name=0001-Fix-apostrophe-handling-in-rust-ts-mode-and-go-ts-mo.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-Fix-apostrophe-handling-in-rust-ts-mode-and-go-ts-mo.patch RnJvbSAxNWRhMmMxZDdlOTJiNzcxYTg4ZjBkZDA2NmYzZmExNWIxZTk4YzUzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/PUQwPTk5PUQwPUJFPUQxPTgwPUQwPUI0PUQw PUIwPUQwPUJEPTIwPUQwPTlDPUQwPUI4PUQwPUJCPz0KID0/VVRGLTg/cT89RDA9QjA9RDA9QjQ9 RDA9Qjg9RDA9QkQ9RDA9QkU9RDA9QjI/PSA8eW9yZGFubUBwbS5tZT4KRGF0ZTogRnJpLCAyNiBN YXkgMjAyMyAxNzoyMzoyNiArMDMwMApTdWJqZWN0OiBbUEFUQ0hdIEZpeCBhcG9zdHJvcGhlIGhh bmRsaW5nIGluIHJ1c3QtdHMtbW9kZSBhbmQgZ28tdHMtbW9kZQoKKiBsaXNwL3Byb2dtb2Rlcy9y dXN0LXRzLW1vZGUuZWwgKHJ1c3QtdHMtbW9kZS0tc3ludGF4LXByb3BlcnRpemUpOgpUcmVhdCBh cG9zdHJvcGhlcyBhcyBzdHJpbmdzIGlmIHVzZWQgdG8gZGVmaW5lIGNoYXJhY3RlciBsaXRlcmFs cy4KVHJlYXQgTFQgYW5kIEdUIGFzIHBhaXJzIGlmIHVzZWQgdG8gZGVmaW5lIHR5cGUgcGFyYW1l dGVycyAoZm9ybWVybHkKdGhleSB3ZXJlIHRyZWF0ZWQgYXMgcGFpcnMgb25seSBmb3IgdHlwZSBh cmd1bWVudHMpLgoKKiBsaXNwL3Byb2dtb2Rlcy9nby10cy1tb2RlLmVsIChnby10cy1tb2RlKTog VHJlYXQgYXBvc3Ryb3BoZXMgYXMKc3RyaW5ncyBpZiB1c2VkIHRvIGRlZmluZSBydW5lIGxpdGVy YWxzLgotLS0KIGxpc3AvcHJvZ21vZGVzL2dvLXRzLW1vZGUuZWwgICB8ICAxICsKIGxpc3AvcHJv Z21vZGVzL3J1c3QtdHMtbW9kZS5lbCB8IDE0ICsrKysrKysrKysrKy0tCiAyIGZpbGVzIGNoYW5n ZWQsIDEzIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9w cm9nbW9kZXMvZ28tdHMtbW9kZS5lbCBiL2xpc3AvcHJvZ21vZGVzL2dvLXRzLW1vZGUuZWwKaW5k ZXggYjg3MDVlY2M0ZDAuLjMyZDg2ZjQ0MjM1IDEwMDY0NAotLS0gYS9saXNwL3Byb2dtb2Rlcy9n by10cy1tb2RlLmVsCisrKyBiL2xpc3AvcHJvZ21vZGVzL2dvLXRzLW1vZGUuZWwKQEAgLTU5LDYg KzU5LDcgQEAgZ28tdHMtbW9kZS0tc3ludGF4LXRhYmxlCiAgICAgKG1vZGlmeS1zeW50YXgtZW50 cnkgPzwgICAiLiIgICAgICB0YWJsZSkKICAgICAobW9kaWZ5LXN5bnRheC1lbnRyeSA/PiAgICIu IiAgICAgIHRhYmxlKQogICAgIChtb2RpZnktc3ludGF4LWVudHJ5ID9cXCAgIlxcIiAgICAgdGFi bGUpCisgICAgKG1vZGlmeS1zeW50YXgtZW50cnkgP1wnICAiXCIiICAgICB0YWJsZSkKICAgICAo bW9kaWZ5LXN5bnRheC1lbnRyeSA/LyAgICIuIDEyNGIiIHRhYmxlKQogICAgIChtb2RpZnktc3lu dGF4LWVudHJ5ID8qICAgIi4gMjMiICAgdGFibGUpCiAgICAgKG1vZGlmeS1zeW50YXgtZW50cnkg P1xuICAiPiBiIiAgICB0YWJsZSkKZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3J1c3QtdHMt bW9kZS5lbCBiL2xpc3AvcHJvZ21vZGVzL3J1c3QtdHMtbW9kZS5lbAppbmRleCBiZTA2YWNkZTNl My4uMzYwZmNjODk0OTEgMTAwNjQ0Ci0tLSBhL2xpc3AvcHJvZ21vZGVzL3J1c3QtdHMtbW9kZS5l bAorKysgYi9saXNwL3Byb2dtb2Rlcy9ydXN0LXRzLW1vZGUuZWwKQEAgLTM1MCw3ICszNTAsMTAg QEAgcnVzdC10cy1tb2RlLS1kZWZ1bi1uYW1lCiAgICAgICAodHJlZXNpdC1ub2RlLWNoaWxkLWJ5 LWZpZWxkLW5hbWUgbm9kZSAibmFtZSIpIHQpKSkpCiAKIChkZWZ1biBydXN0LXRzLW1vZGUtLXN5 bnRheC1wcm9wZXJ0aXplIChiZWcgZW5kKQotICAiQXBwbHkgc3ludGF4IHRleHQgcHJvcGVydHkg dG8gdGVtcGxhdGUgZGVsaW1pdGVycyBiZXR3ZWVuIEJFRyBhbmQgRU5ELgorICAiQXBwbHkgc3lu dGF4IHByb3BlcnRpZXMgdG8gdmFyaW91cyBzcGVjaWFsIGNoYXJhY3RlcnMgd2l0aAorY29udGV4 dHVhbCBtZWFuaW5nIGJldHdlZW4gQkVHIGFuZCBFTkQuCisKKycgc2hvdWxkIGJlIHRyZWF0ZWQg YXMgc3RyaW5nIHdoZW4gdXNlZCBmb3IgY2hhciBsaXRlcmFscy4KIAogPCBhbmQgPiBhcmUgdXN1 YWxseSBwdW5jdHVhdGlvbiwgZS5nLiwgYXMgZ3JlYXRlci9sZXNzLXRoYW4uICBCdXQKIHdoZW4g dXNlZCBmb3IgdHlwZXMsIHRoZXkgc2hvdWxkIGJlIGNvbnNpZGVyZWQgcGFpcnMuCkBAIC0zNTks MTEgKzM2MiwxOCBAQCBydXN0LXRzLW1vZGUtLXN5bnRheC1wcm9wZXJ0aXplCiBhcHByb3ByaWF0 ZSB0ZXh0IHByb3BlcnR5IHRvIGFsdGVyIHRoZSBzeW50YXggb2YgdGVtcGxhdGUKIGRlbGltaXRl cnMgPCBhbmQgPidzLiIKICAgKGdvdG8tY2hhciBiZWcpCisgICh3aGlsZSAoc2VhcmNoLWZvcndh cmQgIiciIGVuZCB0KQorICAgICh3aGVuIChzdHJpbmctZXF1YWwgImNoYXJfbGl0ZXJhbCIKKyAg ICAgICAgICAgICAgICAgICAgICAgICh0cmVlc2l0LW5vZGUtdHlwZQorICAgICAgICAgICAgICAg ICAgICAgICAgICh0cmVlc2l0LW5vZGUtYXQgKG1hdGNoLWJlZ2lubmluZyAwKSkpKQorICAgICAg KHB1dC10ZXh0LXByb3BlcnR5IChtYXRjaC1iZWdpbm5pbmcgMCkgKG1hdGNoLWVuZCAwKQorICAg ICAgICAgICAgICAgICAgICAgICAgICdzeW50YXgtdGFibGUgKHN0cmluZy10by1zeW50YXggIlwi IikpKSkKKyAgKGdvdG8tY2hhciBiZWcpCiAgICh3aGlsZSAocmUtc2VhcmNoLWZvcndhcmQgKHJ4 IChvciAiPCIgIj4iKSkgZW5kIHQpCiAgICAgKHBjYXNlICh0cmVlc2l0LW5vZGUtdHlwZQogICAg ICAgICAgICAgKHRyZWVzaXQtbm9kZS1wYXJlbnQKICAgICAgICAgICAgICAodHJlZXNpdC1ub2Rl LWF0IChtYXRjaC1iZWdpbm5pbmcgMCkpKSkKLSAgICAgICgidHlwZV9hcmd1bWVudHMiCisgICAg ICAoKG9yICJ0eXBlX2FyZ3VtZW50cyIgInR5cGVfcGFyYW1ldGVycyIpCiAgICAgICAgKHB1dC10 ZXh0LXByb3BlcnR5IChtYXRjaC1iZWdpbm5pbmcgMCkKICAgICAgICAgICAgICAgICAgICAgICAg ICAgKG1hdGNoLWVuZCAwKQogICAgICAgICAgICAgICAgICAgICAgICAgICAnc3ludGF4LXRhYmxl Ci0tIAoyLjQwLjEKCg== --b1_9pJJG7euvhrYBbdIvP5HoteUuWaQ545YgiPP9sQSpE--