Mercurial > emacs
changeset 95046:0ec0130d17e7
*** empty log message ***
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 16 May 2008 11:12:29 +0000 |
| parents | dee9cd027812 |
| children | c02467eb5926 |
| files | src/ChangeLog |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri May 16 11:11:31 2008 +0000 +++ b/src/ChangeLog Fri May 16 11:12:29 2008 +0000 @@ -1,3 +1,10 @@ +2008-05-16 Eli Zaretskii <eliz@gnu.org> + + * 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 <monnier@iro.umontreal.ca> * keyboard.c (parse_menu_item): Do not cache key shortcut any more.