From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Daniel =?UTF-8?Q?Mart=C3=ADn?= via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#61893: 29.0.60; Indentation in c-ts-mode broken again Date: Wed, 01 Mar 2023 18:13:37 +0100 Message-ID: References: <83k000fsg8.fsf@gnu.org> <990CFB42-B7E4-4692-858B-20080B19A801@thornhill.no> <83a60wflwm.fsf@gnu.org> Reply-To: Daniel =?UTF-8?Q?Mart=C3=ADn?= Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2583"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (darwin) Cc: 61893@debbugs.gnu.org, Theodor Thornhill , casouri@gmail.com To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Mar 01 18:14:19 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 1pXQ1y-0000Sl-Om for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 01 Mar 2023 18:14:18 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXQ1k-0003kM-Lh; Wed, 01 Mar 2023 12:14:04 -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 1pXQ1i-0003kD-Um for bug-gnu-emacs@gnu.org; Wed, 01 Mar 2023 12:14:02 -0500 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 1pXQ1i-0002d0-MZ for bug-gnu-emacs@gnu.org; Wed, 01 Mar 2023 12:14:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXQ1i-0002dR-5e for bug-gnu-emacs@gnu.org; Wed, 01 Mar 2023 12:14:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Daniel =?UTF-8?Q?Mart=C3=ADn?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 01 Mar 2023 17:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61893 X-GNU-PR-Package: emacs Original-Received: via spool by 61893-submit@debbugs.gnu.org id=B61893.167769082910103 (code B ref 61893); Wed, 01 Mar 2023 17:14:02 +0000 Original-Received: (at 61893) by debbugs.gnu.org; 1 Mar 2023 17:13:49 +0000 Original-Received: from localhost ([127.0.0.1]:54808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXQ1U-0002cs-RU for submit@debbugs.gnu.org; Wed, 01 Mar 2023 12:13:49 -0500 Original-Received: from sonic304-22.consmr.mail.ir2.yahoo.com ([77.238.179.147]:42717) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXQ1S-0002cd-Jd for 61893@debbugs.gnu.org; Wed, 01 Mar 2023 12:13:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.es; s=s2048; t=1677690820; bh=2AdzRAiOdQN6pwoWSjOscubTgjepIEVarFM5F48SKAU=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From:Subject:Reply-To; b=PpG4EGzvuyVKBPelBdtwvOU3SxFDIMQGoqJ5MYWY6yG1bxvWkTd7pXxrNGMkZSSrYk8ebY80mL2VGaS16OXf7uzErSkmDDHRyo9EIeQSt+bihou3Ezt0mH5HgqaVRqbw6rs/nI0AwBG62WY/61aJeyyOakJ4nlXh6tlaaoA4KKd6eWopx566l9lXEwamPBHiR16KmUv4GKfliEQqtv+cvYcPYszeNhej5ZIsvWozD3DoFn5Pot+Ink9VPL7unH4DuN6O/qNs1ovo+ZyJf47CDKJw2/TlLPNLeNn0CaLAcKpn/zefnhUs5iBRy37rij85UgwMC8QuRqAts6eq1YnkoQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1677690820; bh=nYDwwBCA4LRO7BfRuzY61xGaVCDDmZrWPBddgZc+dTk=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=mi0jyDBY9HN/2PkxZ7c0V2+EaL13AMI4orppQOhVrHpRmRP1rwFrSG04q6chbuW++PX8bbe3TclXqmKa8n2SRcYfLeVEssCy3S4Xk/9xr4lO7LJInl8KAlDDAm8LNMFFiu6Rai6sPWrKK11d0OvcyUXI+Bgwx4irD2HmnZ1vJrcv00vGqBDpy1t1kdTvI+CQomMrk/s3x6ZrTA6E7blY1OV/A4b7wR5fr8Qpr3Kv6gcuVcaxD/7TMW2a2w/UMlKhdq4OFS68M97lgL1XEko7t3lzpYkkX6LT4c//nFMi9rnJHQpTtBGQT12mFlZvWIxMnjLeraYPZMgOAW2OcimAdg== X-YMail-OSG: TJcnSwIVM1kx3U5uW8z5UZOeoftiJO_ZuNex.MIW1a4Dt2LjC69OFh6BHyL81IP IlIhPO9wJ1oHe0h3aGMllxub8N16ob5a9WqjGNyj3tcmrSZPqDzWfKsZoRh2d4F_02NZj8dwLtZC unNOMqMyS6aG.e2HLtdSD4gve9d8NqQW8Nrc1xXVSbzq1vnYTJp.9bvuvOzbFUNFCgP.mpasiQT3 J3WYC8QZ062jjIUWhogXvjpGPXiAt5_laPffinFS21Sj_4YSXsRlUHCOPosIImzdaoJVEdrg4MT4 rcFD6UwzmRZ6xA1rXL5o_3kP8hgoBgYRg_ZkVbvsRJVyHSU3TWJf1D9JsinqwB1ubg0bTZ973zr1 NIso5_T8FLKwECio3TqHOgImYSw7BLnOLB117DGJHFBMPO6VsS7wh82hiHDSrJVRaV9HhfET8z4U G.j6BIh8a5Qo0lS6aKogr_GGwsL1Xgd8hwCwQOs9NP63BKDi2nP8VtQJpIfM.P93zf_CSJxiliW5 KkE7dEgmhQvz1syaTpmY7rWtgQV3iHo5AoJrQEVGBOiM0iN3GJ7iBf18uswFQmXNzS4GWlMtEltG jkk.aV5d4AdYpDBxrV9e7Bt4ISorXj96S6w3iOuRIiL4z6WV_bG9KCStUEBoKU79RstbZpcWih5A 91epxHqT0Z6_FJXXTPRfYeAQGuHCu50pXI7VvvJEmNM7ga8g2CcH2DGsnwyuJBbQDZBe7Bk7sGW5 qcK.tXqH5HJ9v7MyB0L3UAh0nEy70rdGQdQYkteBdbRg.voVj1HZsOcrxsEkQOmILlviul2zevqG u64GCxXjW03P.5qPjWtLt.W1crS0sQIRbFREYQjQxe X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic304.consmr.mail.ir2.yahoo.com with HTTP; Wed, 1 Mar 2023 17:13:40 +0000 Original-Received: by hermes--production-ir2-65c64dfd66-pqdpl (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 217ef40a16e30ad612c8f81de664d9dd; Wed, 01 Mar 2023 17:13:38 +0000 (UTC) In-Reply-To: <83a60wflwm.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 01 Mar 2023 18:59:05 +0200") X-Mailer: WebService/1.1.21221 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo 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:257087 Archived-At: Eli Zaretskii writes: >> Date: Wed, 01 Mar 2023 17:35:55 +0100 >> From: Theodor Thornhill >> CC: Yuan Fu >> >> >> >> On 1 March 2023 15:37:43 CET, Eli Zaretskii wrote: >> >Indentation in c-ts-mode on today's emacs-29 branch is in muc worse >> >shape than it was a few days ago. >> > >> >To reproduce: >> > >> > emacs -Q >> > C-x C-f src/dispnew.c RET >> > M-x c-ts-mode RET >> > >> >> >> Not sure, don't believe I've touched it last couple of days. I can take a look this evening! > > Thanks. It's always possible that it behaved like that back then, > although I'm almost sure it didn't. A git bisect pointed to this commit, in case that helps: commit 4a25fa4586c9d419ca96441120f4b9189e13ae1c Author: Yuan Fu Date: Fri Feb 24 18:40:52 2023 -0800 Align to prev sibling for c-ts-mode indentation As requested by a discussion on emacs-devel. * lisp/progmodes/c-ts-mode.el: (c-ts-mode--anchor-prev-sibling): New function. (c-ts-mode--indent-styles): Indent first child as before, indent the rest to their previous sibling. Remove bracketless statement rules that I forgot to remove previously. lisp/progmodes/c-ts-mode.el | 46 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-)