# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1153229333 0
# Node ID 6dd00de34fffc3e0585cb028a37baeeb67b9eab4
# Parent  de36a2bee064354c4514e4858a5336d39e336ac2
(compile_pattern_1): Use xsignal1.
(signal_failure): Remove (was only called once).
(search_command): Use xsignal1 instead of signal_failure.

diff -r de36a2bee064 -r 6dd00de34fff src/search.c
--- a/src/search.c	Tue Jul 18 13:28:45 2006 +0000
+++ b/src/search.c	Tue Jul 18 13:28:53 2006 +0000
@@ -83,6 +83,9 @@
 
 Lisp_Object Qinvalid_regexp;
 
+/* Error condition used for failing searches */
+Lisp_Object Qsearch_failed;
+
 Lisp_Object Vsearch_spaces_regexp;
 
 static void set_search_regs ();
@@ -179,7 +182,7 @@
   re_set_syntax (old);
   UNBLOCK_INPUT;
   if (val)
-    Fsignal (Qinvalid_regexp, Fcons (build_string (val), Qnil));
+    xsignal1 (Qinvalid_regexp, build_string (val));
 
   cp->regexp = Fcopy_sequence (pattern);
 }
@@ -266,16 +269,6 @@
   return &cp->buf;
 }
 
-/* Error condition used for failing searches */
-Lisp_Object Qsearch_failed;
-
-Lisp_Object
-signal_failure (arg)
-     Lisp_Object arg;
-{
-  Fsignal (Qsearch_failed, Fcons (arg, Qnil));
-  return Qnil;
-}
 
 static Lisp_Object
 looking_at_1 (string, posix)
@@ -948,7 +941,8 @@
   if (np <= 0)
     {
       if (NILP (noerror))
-	return signal_failure (string);
+	xsignal1 (Qsearch_failed, string);
+
       if (!EQ (noerror, Qt))
 	{
 	  if (lim < BEGV || lim > ZV)