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

[Jason Rumney]

Index: emacs/src/ChangeLog
diff -c emacs/src/ChangeLog:1.3925 emacs/src/ChangeLog:1.3926
*** emacs/src/ChangeLog:1.3925  Sat Oct 16 14:52:04 2004
--- emacs/src/ChangeLog Sat Oct 16 23:00:26 2004
***************
*** 1,3 ****
--- 1,7 ----
+ 2004-10-16  Jason Rumney  <address@hidden>
+ 
+       * w32fns.c (w32_font_match): Encode font name being matched.
+ 
  2004-10-16  Richard M. Stallman  <address@hidden>
  
        * window.c (Fspecial_display_p): Doc fix.
***************
*** 25,30 ****
--- 29,35 ----
  
        * fns.c (map_char_table): Add missing gcpros.
  
+ >>>>>>> 1.3925
  2004-10-13  Stefan Monnier  <address@hidden>
  
        * keymap.c (get_keymap): An autoload form is not a keymap.