bug#73832: [PATCH] Fix misplaced paren in c-ts-mode--anchor-prev-sibling

bug#73832: [PATCH] Fix misplaced paren in c-ts-mode--anchor-prev-sibling

[Noah Peart]

[-- Attachment #1.1: Type: text/plain, Size: 768 bytes --]

Tags: patch


It looks like a parenthesis was misplaced in the recent change to
c-ts-mode--anchor-prev-sibling causing an infinite loop during
indentation.


In GNU Emacs 31.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version
3.24.41, cairo version 1.18.0) of 2024-10-14 built on noah-X580VD
Repository revision: 2a6f1527f6b3080c3879e6159424b824c86801a7
Repository branch: master
Windowing system distributor 'The X.Org Foundation', version 11.0.12101011
System Description: Ubuntu 24.04.1 LTS

Configured using:
 'configure --prefix=/usr/local --with-modules --with-tree-sitter
--with-threads --with-gnutls --with-mailutils --with-jpeg --with-png
--with-rsvg --with-tiff --with-xml2 --with-xpm --with-imagemagick
CC=gcc-13 CXX=gcc-13 CFLAGS= CXXFLAGS= PKG_CONFIG_PATH='

[-- Attachment #1.2: Type: text/html, Size: 868 bytes --]

[-- Attachment #2: 0001-Fix-misplaced-paren-in-c-ts-mode-anchor-prev-sibling.patch --]
[-- Type: text/x-patch, Size: 1247 bytes --]

From cc34936efba46568505d8801dc335f8cec8f731e Mon Sep 17 00:00:00 2001
From: Noah Peart <noah.v.peart@gmail.com>
Date: Tue, 15 Oct 2024 19:31:28 -0700
Subject: [PATCH] Fix misplaced paren in c-ts-mode--anchor-prev-sibling

* lisp/progmodes/c-ts-mode.el (c-ts-mode--anchor-prev-sibling):
Fix parentheses around condition.
---
 lisp/progmodes/c-ts-mode.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 3f6a7422aa0..0d7f95e9a6d 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -343,8 +343,8 @@ c-ts-mode--anchor-prev-sibling
           ;; and starting the items on the same line as {.
           (_ (goto-char (treesit-node-start prev-sibling))
              (if (or (looking-back (rx bol (* whitespace))
-                                   (line-beginning-position)))
-                     (null (treesit-node-prev-sibling prev-sibling t))
+                                   (line-beginning-position))
+                     (null (treesit-node-prev-sibling prev-sibling t)))
                  (setq continue nil)
                (setq prev-sibling
                      (treesit-node-prev-sibling prev-sibling)))))))
-- 
2.43.0

bug#73832: [PATCH] Fix misplaced paren in c-ts-mode--anchor-prev-sibling

[Eli Zaretskii]

> From: Noah Peart <noah.v.peart@gmail.com>
> Date: Tue, 15 Oct 2024 19:37:00 -0700
> 
> Tags: patch
> 
> It looks like a parenthesis was misplaced in the recent change to
> c-ts-mode--anchor-prev-sibling causing an infinite loop during
> indentation.

Thanks, this is bug#73661, which was recently fixed on the emacs-30
branch (the fix will be merged to master in a couple of days).

Yuan, am I right?

bug#73832: [PATCH] Fix misplaced paren in c-ts-mode--anchor-prev-sibling

[Yuan Fu]

> On Oct 15, 2024, at 10:36 PM, Eli Zaretskii <eliz@gnu.org> wrote:
> 
>> From: Noah Peart <noah.v.peart@gmail.com>
>> Date: Tue, 15 Oct 2024 19:37:00 -0700
>> 
>> Tags: patch
>> 
>> It looks like a parenthesis was misplaced in the recent change to
>> c-ts-mode--anchor-prev-sibling causing an infinite loop during
>> indentation.
> 
> Thanks, this is bug#73661, which was recently fixed on the emacs-30
> branch (the fix will be merged to master in a couple of days).
> 
> Yuan, am I right?

Yeah, I fixed it yesterday on emacs-30, sorry for the hurdle guys. And thanks Noah for the patch.

Yuan

bug#73832: [PATCH] Fix misplaced paren in c-ts-mode--anchor-prev-sibling

[Eli Zaretskii]

> From: Yuan Fu <casouri@gmail.com>
> Date: Tue, 15 Oct 2024 22:53:37 -0700
> Cc: Noah Peart <noah.v.peart@gmail.com>,
>  73832@debbugs.gnu.org
> 
> 
> 
> > On Oct 15, 2024, at 10:36 PM, Eli Zaretskii <eliz@gnu.org> wrote:
> > 
> >> It looks like a parenthesis was misplaced in the recent change to
> >> c-ts-mode--anchor-prev-sibling causing an infinite loop during
> >> indentation.
> > 
> > Thanks, this is bug#73661, which was recently fixed on the emacs-30
> > branch (the fix will be merged to master in a couple of days).
> > 
> > Yuan, am I right?
> 
> Yeah, I fixed it yesterday on emacs-30, sorry for the hurdle guys. And thanks Noah for the patch.

OK, closing.

bug#73832: [PATCH] Fix misplaced paren in c-ts-mode--anchor-prev-sibling

[Noah Peart]

[-- Attachment #1: Type: text/plain, Size: 772 bytes --]

Thanks guys - sorry I missed the bug.

On Tue, Oct 15, 2024 at 10:53 PM Yuan Fu <casouri@gmail.com> wrote:

>
>
> > On Oct 15, 2024, at 10:36 PM, Eli Zaretskii <eliz@gnu.org> wrote:
> >
> >> From: Noah Peart <noah.v.peart@gmail.com>
> >> Date: Tue, 15 Oct 2024 19:37:00 -0700
> >>
> >> Tags: patch
> >>
> >> It looks like a parenthesis was misplaced in the recent change to
> >> c-ts-mode--anchor-prev-sibling causing an infinite loop during
> >> indentation.
> >
> > Thanks, this is bug#73661, which was recently fixed on the emacs-30
> > branch (the fix will be merged to master in a couple of days).
> >
> > Yuan, am I right?
>
> Yeah, I fixed it yesterday on emacs-30, sorry for the hurdle guys. And
> thanks Noah for the patch.
>
> Yuan

[-- Attachment #2: Type: text/html, Size: 1294 bytes --]