Mercurial > emacs
changeset 57533:150f1a99cbe4
*** empty log message ***
author | Jason Rumney <jasonr@gnu.org> |
---|---|
date | Sat, 16 Oct 2004 23:00:26 +0000 |
parents | 53338d8522cb |
children | 1a10f9dbc3cc |
files | src/ChangeLog |
diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Oct 16 18:59:11 2004 +0000 +++ b/src/ChangeLog Sat Oct 16 23:00:26 2004 +0000 @@ -1,3 +1,7 @@ +2004-10-16 Jason Rumney <jasonr@gnu.org> + + * w32fns.c (w32_font_match): Encode font name being matched. + 2004-10-16 Richard M. Stallman <rms@gnu.org> * window.c (Fspecial_display_p): Doc fix. @@ -25,6 +29,7 @@ * fns.c (map_char_table): Add missing gcpros. +>>>>>>> 1.3925 2004-10-13 Stefan Monnier <monnier@iro.umontreal.ca> * keymap.c (get_keymap): An autoload form is not a keymap.