Merge changes from emacs-23 branch.

[bpt/emacs.git] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 639759b..938cc73 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-14  Damyan Pepper  <damyanp@gmail.com>
+
+       Fix handling of font properties on Windows (bug#6303).
+       * font.c (font_filter_properties): New function, refactored from
+       ftfont_filter_properties.
+       * font.h (font_filter_properties): Declare.
+       * ftfont.c (ftfont_filter_properties): Use font_filter_properties.
+       * w32font.c (w32font_booleans, w32font_non_booleans): New variables.
+       (w32font_filter_properties): New function.
+       (w32font_driver): Add w32font_filter_properties.
+
+2010-10-14  Juanma Barranquero  <lekktu@gmail.com>
+
+       * font.c (Ffont_variation_glyphs):
+       * ccl.c (Fccl_execute_on_string): Fix typo in docstring.
+
 2010-10-14  Juanma Barranquero  <lekktu@gmail.com>
 
        * w32fns.c (w32_wnd_proc, file_dialog_callback):