Mercurial > emacs
comparison src/xfaces.c @ 90189:6141b4c28957
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-58
src/xfaces.c (Finternal_lisp_face_equal_p): Restore calculation of frame
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 06 Jun 2005 03:26:08 +0000 |
parents | 01137c1fdbe9 |
children | a1b34dec1104 |
comparison
equal
deleted
inserted
replaced
90188:01137c1fdbe9 | 90189:6141b4c28957 |
---|---|
5133 If FRAME is omitted or nil, use the selected frame. */) | 5133 If FRAME is omitted or nil, use the selected frame. */) |
5134 (face1, face2, frame) | 5134 (face1, face2, frame) |
5135 Lisp_Object face1, face2, frame; | 5135 Lisp_Object face1, face2, frame; |
5136 { | 5136 { |
5137 int equal_p; | 5137 int equal_p; |
5138 struct frame *f; | |
5138 Lisp_Object lface1, lface2; | 5139 Lisp_Object lface1, lface2; |
5140 | |
5141 if (EQ (frame, Qt)) | |
5142 f = NULL; | |
5143 else | |
5144 /* Don't use check_x_frame here because this function is called | |
5145 before X frames exist. At that time, if FRAME is nil, | |
5146 selected_frame will be used which is the frame dumped with | |
5147 Emacs. That frame is not an X frame. */ | |
5148 f = frame_or_selected_frame (frame, 2); | |
5139 | 5149 |
5140 lface1 = lface_from_face_name (f, face1, 1); | 5150 lface1 = lface_from_face_name (f, face1, 1); |
5141 lface2 = lface_from_face_name (f, face2, 1); | 5151 lface2 = lface_from_face_name (f, face2, 1); |
5142 equal_p = lface_equal_p (XVECTOR (lface1)->contents, | 5152 equal_p = lface_equal_p (XVECTOR (lface1)->contents, |
5143 XVECTOR (lface2)->contents); | 5153 XVECTOR (lface2)->contents); |