diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode index bafe8f57b43..59433903339 100644 --- a/src/ChangeLog.unicode +++ b/src/ChangeLog.unicode @@ -1,3 +1,8 @@ +2005-06-05 Miles Bader + + * xfaces.c (Finternal_lisp_face_equal_p): Restore previously + removed calculation of frame `f', as it's now used. + 2005-05-22 YAMAMOTO Mitsuharu * macterm.c (x_font_name_to_mac_font_name): Sync with trunk diff --git a/src/xfaces.c b/src/xfaces.c index 97bdd380dee..fc8a0bc05af 100644 --- 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,