Mercurial > emacs
changeset 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 | d8a6a0474c49 |
| files | src/ChangeLog.unicode src/xfaces.c |
| diffstat | 2 files changed, 15 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog.unicode Mon Jun 06 02:39:45 2005 +0000 +++ b/src/ChangeLog.unicode Mon Jun 06 03:26:08 2005 +0000 @@ -1,3 +1,8 @@ +2005-06-05 Miles Bader <miles@gnu.org> + + * xfaces.c (Finternal_lisp_face_equal_p): Restore previously + removed calculation of frame `f', as it's now used. + 2005-05-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * macterm.c (x_font_name_to_mac_font_name): Sync with trunk
--- a/src/xfaces.c Mon Jun 06 02:39:45 2005 +0000 +++ b/src/xfaces.c Mon Jun 06 03:26:08 2005 +0000 @@ -5135,8 +5135,18 @@ 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,