[Emacs-diffs] Changes to emacs/src/ChangeLog,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/05/16 11:12:33

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.6423
retrieving revision 1.6424
diff -u -b -r1.6423 -r1.6424
--- ChangeLog   16 May 2008 04:28:21 -0000      1.6423
+++ ChangeLog   16 May 2008 11:12:29 -0000      1.6424
@@ -1,3 +1,10 @@
+2008-05-16  Eli Zaretskii  <address@hidden>
+
+       * xfaces.c (merge_face_ref, merge_face_vectors)
+       (Finternal_set_lisp_face_attribute): Use FONT_*_INDEX only when
+       HAVE_WINDOW_SYSTEM is defined.
+       (Fface_font): Fix non-HAVE_WINDOW_SYSTEM case.
+
 2008-05-16  Stefan Monnier  <address@hidden>
 
        * keyboard.c (parse_menu_item): Do not cache key shortcut any more.