Commit 8009eb44 authored by Kim F. Storm's avatar Kim F. Storm
Browse files

* xfaces.c (signal_error): Move to eval.c.

(resolve_face_name): Use xsignal1.
parent ba96a5cf
......@@ -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;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment