Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-58

[bpt/emacs.git] / src / xfaces.c

diff --git a/src/xfaces.c b/src/xfaces.c
index 97bdd38..fc8a0bc 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5135,8 +5135,18 @@ If FRAME is omitted or nil, use the selected frame.  */)
      Lisp_Object face1, face2, frame;
 {
   int equal_p;
+  struct frame *f;
   Lisp_Object lface1, lface2;
 
+  if (EQ (frame, Qt))
+    f = NULL;
+  else
+    /* Don't use check_x_frame here because this function is called
+       before X frames exist.  At that time, if FRAME is nil,
+       selected_frame will be used which is the frame dumped with
+       Emacs.  That frame is not an X frame.  */
+    f = frame_or_selected_frame (frame, 2);
+
   lface1 = lface_from_face_name (f, face1, 1);
   lface2 = lface_from_face_name (f, face2, 1);
   equal_p = lface_equal_p (XVECTOR (lface1)->contents,