# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1097967626 0
# Node ID 150f1a99cbe46d8e18d930351c96564c5f384e4e
# Parent  53338d8522cbec5ec34131f64024f998058d92a1
*** empty log message ***

diff -r 53338d8522cb -r 150f1a99cbe4 src/ChangeLog
--- 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.