From d1079cced208541c30187cbed910fa2d4180db28 Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <basil@contovou.net>
Date: Wed, 11 Mar 2026 23:25:45 +0100
Subject: [PATCH] Replace remaining uses of Qwrong_type_argument

For discussion, see:
https://lists.gnu.org/r/emacs-devel/2026-03/msg00306.html

* src/comp.c (helper_GET_SYMBOL_WITH_POSITION): Use
symbol-with-pos-p, not wrong-type-argument, in the
wrong-type-argument error predicate slot.
* src/data.c (Fbare_symbol):
* src/print.c (print_bind_overrides):
* src/treesit.c (Ftreesit_parser_create, treesit_resolve_node):
Prefer wrong_type_argument over xsignal2.
---
 src/comp.c    | 3 +--
 src/data.c    | 2 +-
 src/print.c   | 8 ++++----
 src/treesit.c | 8 ++++----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/comp.c b/src/comp.c
index ac45eb72cfc..0ac980e6276 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -4976,8 +4976,7 @@ helper_PSEUDOVECTOR_TYPEP_XUNTAG (Lisp_Object a, enum pvec_type code)
 static struct Lisp_Symbol_With_Pos *
 helper_GET_SYMBOL_WITH_POSITION (Lisp_Object a)
 {
-  if (!SYMBOL_WITH_POS_P (a))
-    wrong_type_argument (Qwrong_type_argument, a);
+  CHECK_TYPE (SYMBOL_WITH_POS_P (a), Qsymbol_with_pos_p, a);
   return XUNTAG (a, Lisp_Vectorlike, struct Lisp_Symbol_With_Pos);
 }
 
diff --git a/src/data.c b/src/data.c
index 4973d577c1c..917181a38e6 100644
--- a/src/data.c
+++ b/src/data.c
@@ -841,7 +841,7 @@ This function ignores `symbols-with-pos-enabled'.  */)
     return sym;
   if (SYMBOL_WITH_POS_P (sym))
     return XSYMBOL_WITH_POS_SYM (sym);
-  xsignal2 (Qwrong_type_argument, list2 (Qsymbolp, Qsymbol_with_pos_p), sym);
+  wrong_type_argument (list2 (Qsymbolp, Qsymbol_with_pos_p), sym);
 }
 
 DEFUN ("symbol-with-pos-pos", Fsymbol_with_pos_pos, Ssymbol_with_pos_pos, 1, 1, 0,
diff --git a/src/print.c b/src/print.c
index ef09b5fbc38..008ec8a6211 100644
--- a/src/print.c
+++ b/src/print.c
@@ -708,7 +708,7 @@ print_bind_overrides (Lisp_Object overrides)
   if (EQ (overrides, Qt))
     print_bind_all_defaults ();
   else if (!CONSP (overrides))
-    xsignal2 (Qwrong_type_argument, Qconsp, overrides);
+    wrong_type_argument (Qconsp, overrides);
   else
     {
       while (!NILP (overrides))
@@ -717,19 +717,19 @@ print_bind_overrides (Lisp_Object overrides)
 	  if (EQ (setting, Qt))
 	    print_bind_all_defaults ();
 	  else if (!CONSP (setting))
-	    xsignal2 (Qwrong_type_argument, Qconsp, setting);
+	    wrong_type_argument (Qconsp, setting);
 	  else
 	    {
 	      Lisp_Object key = XCAR (setting),
 		value = XCDR (setting);
 	      Lisp_Object map = Fassq (key, Vprint_variable_mapping);
 	      if (NILP (map))
-		xsignal2 (Qwrong_type_argument, Qsymbolp, map);
+		wrong_type_argument (Qsymbolp, map);
 	      specbind (XCAR (XCDR (map)), value);
 	    }
 
 	  if (!NILP (XCDR (overrides)) && !CONSP (XCDR (overrides)))
-	    xsignal2 (Qwrong_type_argument, Qconsp, overrides);
+	    wrong_type_argument (Qconsp, overrides);
 	  overrides = XCDR (overrides);
 	}
     }
diff --git a/src/treesit.c b/src/treesit.c
index 8c38ba82e37..bec37067b50 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2364,7 +2364,7 @@ an indirect buffer.  */)
     buf = buf->base_buffer;
 
   if (EQ (tag, Qt))
-    xsignal2(Qwrong_type_argument, list2(Qnot, Qt), Qt);
+    wrong_type_argument (list2 (Qnot, Qt), Qt);
 
   treesit_check_buffer_size (buf);
 
@@ -3914,9 +3914,9 @@ static Lisp_Object treesit_resolve_node (Lisp_Object obj)
       return Ftreesit_parser_root_node (parser);
     }
   else
-    xsignal2 (Qwrong_type_argument,
-	      list4 (Qor, Qtreesit_node_p, Qtreesit_parser_p, Qsymbolp),
-	      obj);
+    wrong_type_argument (list4 (Qor, Qtreesit_node_p,
+				Qtreesit_parser_p, Qsymbolp),
+			 obj);
 }
 
 /* Create and initialize QUERY.  When success, initialize TS_QUERY,