(Finternal_lisp_face_p): Signal error for face alias loops.

2 files changed, 7 insertions, 1 deletions

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  <lekktu@gmail.com>
+
+        * xfaces.c (Finternal_lisp_face_p): Signal error for face alias loops.
+
 2007-06-03  Nick Roberts  <nickrob@snap.net.nz>
 
         * 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);