From: Kim F. Storm <storm@cua.dk>
Date: Tue, 18 Jul 2006 13:30:04 +0000 (+0000)
Subject: * xfaces.c (signal_error): Move to eval.c.
X-Git-Tag: emacs-pretest-22.0.90~1356
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8009eb445e3bb2e536efed1bfa3cef69482ae079;p=emacs.git

* xfaces.c (signal_error): Move to eval.c.
(resolve_face_name): Use xsignal1.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 14572af966d..f67ea61b37a 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -486,7 +486,6 @@ static int font_scalable_p P_ ((struct font_name *));
 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 @@ xstrlwr (s)
 }
 
 
-/* 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 @@ resolve_face_name (face_name, signal_p)
       if (EQ (hare, tortoise))
 	{
 	  if (signal_p)
-	    Fsignal (Qcircular_list, Fcons (orig_face, Qnil));
+	    xsignal1 (Qcircular_list, orig_face);
 	  return Qdefault;
 	}
     }