From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: john muhl Newsgroups: gmane.emacs.bugs Subject: bug#75107: [PATCH] Fix comment indent in 'lua-ts-mode' and old grammar Date: Wed, 25 Dec 2024 19:42:58 -0600 Message-ID: <87seqb43tp.fsf@pub.pink> References: <8734ib5io5.fsf@pub.pink> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39966"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.12.1; emacs 31.0.50 To: 75107@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Dec 26 02:44:30 2024 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 1tQcvN-000ADD-Bo for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 26 Dec 2024 02:44:30 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tQcv0-0000Hp-2k; Wed, 25 Dec 2024 20:44:06 -0500 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 1tQcuz-0000H3-2f for bug-gnu-emacs@gnu.org; Wed, 25 Dec 2024 20:44:05 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tQcux-0001Rf-R8 for bug-gnu-emacs@gnu.org; Wed, 25 Dec 2024 20:44:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=bsZJxsFBQjMOz9afmTfGNhZWLWvJoULZDC6EYfKYGC0=; b=EtkorxClRV1+Yz5X4bpUlMb/jhZyQhrCiTbaQVO3LegJrHmavNSeC2cB5h6ROsrTzi/FKvVoW+COPpWNfHw3YyqEvzgwacSz/hcLj6vsbVe/drvuTH0OUaagqKuqogYxzttx5Msf+0zzZ+UOo4EXEn97mGCQXGQm4yY0qnjSyUkKDb8+EaNwzUkx7u3BimzwCC4X0vw4Ohr7niDFQ3G5Mx1Us2UyjVR3T9mbnQMHJ0Rc4qBWHZ1lEji/wY1oUhIVT8ymx2q7oVWEALIU4213Q4ojHt6w2W9ze4egzEXR5rnsMA+Oq+tUoGAQEqnOg73bjO2sAqSaNoZLjW1eoIrv4w==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tQcux-00068D-FO for bug-gnu-emacs@gnu.org; Wed, 25 Dec 2024 20:44:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: john muhl Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 26 Dec 2024 01:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75107 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 75107-submit@debbugs.gnu.org id=B75107.173517738923420 (code B ref 75107); Thu, 26 Dec 2024 01:44:03 +0000 Original-Received: (at 75107) by debbugs.gnu.org; 26 Dec 2024 01:43:09 +0000 Original-Received: from localhost ([127.0.0.1]:39498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tQcu4-00065f-Iq for submit@debbugs.gnu.org; Wed, 25 Dec 2024 20:43:08 -0500 Original-Received: from fout-b1-smtp.messagingengine.com ([202.12.124.144]:36609) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tQcu1-00064z-PE for 75107@debbugs.gnu.org; Wed, 25 Dec 2024 20:43:06 -0500 Original-Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfout.stl.internal (Postfix) with ESMTP id F101F114012A for <75107@debbugs.gnu.org>; Wed, 25 Dec 2024 20:42:59 -0500 (EST) Original-Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-12.internal (MEProxy); Wed, 25 Dec 2024 20:43:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pub.pink; h=cc :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm1; t=1735177379; x=1735263779; bh=bsZJxsFBQj MOz9afmTfGNhZWLWvJoULZDC6EYfKYGC0=; b=foQmtXiCXqOhZ/dzMvyMfvgwf/ wyfF4GxZF3gAO9N1YA4SBg3kfaenEqAsOSZteTBabt2hKUHDtD3iXlnSv7qUUU4I WoeSTT0i+Yd64aeqbWc6jxSFFBUIPvfpLEbB/HbsG5hghUT7n7HdGJqLTroXPZky YCw+/r7LQLHREtr/ZRBjzbmHuawY4V7/2P0d/kUtyFNSh42OS9/z8xYsdADWiphT zFbV9sV8qb9PyCAxa26yzyxE9bXeu/d6HopOL895a1C+FX7OFao1SfLhD0eEyKmJ 4yb5nquQY22hi9IaJ8E/PlLr4TWmlBSCIVtizAW6Ertv08SzD3DBZ9exGCBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1735177379; x=1735263779; bh=bsZJxsFBQjMOz9afmTfGNhZWLWvJoULZDC6 EYfKYGC0=; b=GtOEuPMRYFDP4LhePgREaa9c0GiPlGUbcaBMcF+/8I1q/x3BtCk tsgDOBvR9mhR8+p6/t0huEYhNvWA27r6NUACLfTy2l52grLDbMTpTb40szmrAVd7 JHXlnNrzFX0ffvfLUpgrwFTZONApuU6I5115tlSLVaPR5TzibYUi+19lRGUeGyxU BdwgSfW4mNOFGHEFvZpaH810pxU3AkyYclPIT14k+bDDu4dPunMRTbditR8dQS7J aWMfR9X6Dh1pML27dp5fWdgyklkATXNfjdbkSvh70uGP6vToZ21ruORoNTfUBe7/ vGrm2Qoj6TGq7GqqfNwOfty0FlThEOZdjDg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddruddujedgfeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffujg hffgffkfggtgesmhdtreertdertdenucfhrhhomhepjhhohhhnuchmuhhhlhcuoehjmhes phhusgdrphhinhhkqeenucggtffrrghtthgvrhhnpefgleehkeehveevtdefjedtuddvie fhgfekudelveeuheekgeffleeuvdetheetueenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehjmhesphhusgdrphhinhhkpdhnsggprhgtphhtth hopedupdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejhedutdejseguvggssghu ghhsrdhgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i74194916:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA for <75107@debbugs.gnu.org>; Wed, 25 Dec 2024 20:42:59 -0500 (EST) In-Reply-To: <8734ib5io5.fsf@pub.pink> (john muhl's message of "Wed, 25 Dec 2024 19:36:58 -0600") 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:297745 Archived-At: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Fix-comment-indent-in-lua-ts-mode-and-old-grammar.patch >From e4a9647912545fa0d97370bba9919db3a9acb219 Mon Sep 17 00:00:00 2001 From: john muhl Date: Wed, 25 Dec 2024 18:03:50 -0600 Subject: [PATCH] Fix comment indent in 'lua-ts-mode' and old grammar * lisp/progmodes/lua-ts-mode.el (lua-ts--simple-indent-rules): Improve multi-line comment indention for pre-0.0.19 grammars that used a different structure for comment start/end markers. (Bug#75107) --- lisp/progmodes/lua-ts-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el index 6fa3e51b34b..857be185fcf 100644 --- a/lisp/progmodes/lua-ts-mode.el +++ b/lisp/progmodes/lua-ts-mode.el @@ -281,7 +281,7 @@ lua-ts--simple-indent-rules lua-ts--multi-line-comment-start (parent-is "comment_content") (parent-is "string_content") - (node-is "]]")) + (or (node-is "]]") (node-is "comment_end"))) no-indent 0) ((and (n-p-gp "field" "table_constructor" "arguments") lua-ts--multi-arg-function-call-matcher -- 2.47.1 --=-=-= Content-Type: text/plain john muhl writes: > Tags: patch > > This makes all the tests pass and fixes a bug with multi-line > comment indent with some of the older grammars. Namely v0.0.18 > which is packaged in Debian testing and some of its derivatives > (e.g. Ubuntu). --=-=-=--