mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-15 07:41:09 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
src/xfaces.c (Finternal_lisp_face_equal_p): Restore calculation of frame
This commit is contained in:
Miles Bader 2005-06-06 03:26:08 +00:00
parent fdffd34626
commit 7b953c9cd0
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog.unicode
View file

@ -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

10
src/xfaces.c
View file

@ -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,