# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1153229404 0
# Node ID 7608074632265f3f7afcf5a04adee6a82ac7598b
# Parent  2cbe7a01a491573c20e5aa924bd3976b3f4eebb3
* xfaces.c (signal_error): Move to eval.c.
(resolve_face_name): Use xsignal1.

diff -r 2cbe7a01a491 -r 760807463226 src/xfaces.c
--- a/src/xfaces.c	Tue Jul 18 13:29:55 2006 +0000
+++ b/src/xfaces.c	Tue Jul 18 13:30:04 2006 +0000
@@ -486,7 +486,6 @@
 static int get_lface_attributes P_ ((struct frame *, Lisp_Object, Lisp_Object *, int));
 static int load_pixmap P_ ((struct frame *, Lisp_Object, unsigned *, unsigned *));
 static unsigned char *xstrlwr P_ ((unsigned char *));
-static void signal_error P_ ((char *, Lisp_Object));
 static struct frame *frame_or_selected_frame P_ ((Lisp_Object, int));
 static void load_face_font P_ ((struct frame *, struct face *, int));
 static void load_face_colors P_ ((struct frame *, struct face *, Lisp_Object *));
@@ -855,17 +854,6 @@
 }
 
 
-/* Signal `error' with message S, and additional argument ARG.  */
-
-static void
-signal_error (s, arg)
-     char *s;
-     Lisp_Object arg;
-{
-  Fsignal (Qerror, Fcons (build_string (s), Fcons (arg, Qnil)));
-}
-
-
 /* If FRAME is nil, return a pointer to the selected frame.
    Otherwise, check that FRAME is a live frame, and return a pointer
    to it.  NPARAM is the parameter number of FRAME, for
@@ -3273,7 +3261,7 @@
       if (EQ (hare, tortoise))
 	{
 	  if (signal_p)
-	    Fsignal (Qcircular_list, Fcons (orig_face, Qnil));
+	    xsignal1 (Qcircular_list, orig_face);
 	  return Qdefault;
 	}
     }