From 65fddb7472842a1de3be0e8b0fdba849b6555bcc Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 5 Jun 2007 10:06:19 +0000 Subject: [PATCH] (Finternal_lisp_face_p): Signal error for face alias loops. --- src/ChangeLog | 6 +++++- src/xfaces.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index ecfbb087c45..e1e8867e882 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,8 +1,12 @@ +2007-06-05 Juanma Barranquero + + * xfaces.c (Finternal_lisp_face_p): Signal error for face alias loops. + 2007-06-03 Nick Roberts * keyboard.c (discard_mouse_events): Add GPM_CLICK_EVENT case. - * frame.c (Fmouse_position, Fmouse_pixel_position): + * frame.c (Fmouse_position, Fmouse_pixel_position): Condition on HAVE_GPM too. * term.c (term_mouse_highlight): Remove unused variables. diff --git a/src/xfaces.c b/src/xfaces.c index 07ea34bf736..b30d673241f 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -3935,6 +3935,8 @@ Otherwise check for the existence of a global face. */) { Lisp_Object lface; + face = resolve_face_name (face, 1); + if (!NILP (frame)) { CHECK_LIVE_FRAME (frame); -- 2.39.2