bug#68954: Offending commit

[Dominique Quatravaux <dominique@quatravaux.org>]

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

Le jeu. 8 févr. 2024 à 02:35, Yuan Fu <casouri@gmail.com> a écrit :

>
>
> Actually, here’s what I would write for your change, feel free to modify
> it as you like.
>
>
Many thanks for the step-by-step instructions! Attached is what `git
format-patch` gave me, I hope that I got everything right.

Yours truly,

--
 Dominique Quatravaux
 dominique@quatravaux.org

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

[-- Attachment #2: 0001-Fix-treesit_traverse_get_predicate-bug-68954.patch --]
[-- Type: application/octet-stream, Size: 1305 bytes --]

From 0eb6c02b3f16b4567053b7476039b0fbf6a0f55a Mon Sep 17 00:00:00 2001
From: Dominique Quatravaux <dominique.quatravaux@epfl.ch>
Date: Thu, 8 Feb 2024 10:19:10 +0100
Subject: [PATCH] Fix treesit_traverse_get_predicate (bug#68954)

Commit d005e685e1df7692085378633348db39a5190374 should have replaced
assq_no_quit with assq_no_signal, but didn't, this commit fixes that.

* src/treesit.c (treesit_traverse_get_predicate): Replace assq_no_quit
with assq_no_signal.

Copyright-paperwork-exempt: yes
---
 src/treesit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/treesit.c b/src/treesit.c
index 69b59fca111..aece3a7728e 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -3268,11 +3268,11 @@ treesit_traverse_child_helper (TSTreeCursor *cursor,
 static Lisp_Object
 treesit_traverse_get_predicate (Lisp_Object thing, Lisp_Object language)
 {
-  Lisp_Object cons = assq_no_quit (language, Vtreesit_thing_settings);
+  Lisp_Object cons = assq_no_signal (language, Vtreesit_thing_settings);
   if (NILP (cons))
     return Qnil;
   Lisp_Object definitions = XCDR (cons);
-  Lisp_Object entry = assq_no_quit (thing, definitions);
+  Lisp_Object entry = assq_no_signal (thing, definitions);
   if (NILP (entry))
     return Qnil;
   /* ENTRY looks like (THING PRED).  */
-- 
2.43.0