aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorJuanma Barranquero2010-10-14 16:32:27 +0200
committerJuanma Barranquero2010-10-14 16:32:27 +0200
commit220d91b834f7f7252b9953460422151b86b3520c (patch)
tree8f3e16983e83ac0da6beef346cb05cd2591a7f83 /src/ChangeLog
parent31e96eecc09283b5169faf0d5dc1c8efd58539ac (diff)
parent9d4f32e88a1b642070f0adb41df04a0846c31970 (diff)
downloademacs-220d91b834f7f7252b9953460422151b86b3520c.tar.gz
emacs-220d91b834f7f7252b9953460422151b86b3520c.zip
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 639759bf384..938cc73e7c3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
12010-10-14 Damyan Pepper <damyanp@gmail.com>
2
3 Fix handling of font properties on Windows (bug#6303).
4 * font.c (font_filter_properties): New function, refactored from
5 ftfont_filter_properties.
6 * font.h (font_filter_properties): Declare.
7 * ftfont.c (ftfont_filter_properties): Use font_filter_properties.
8 * w32font.c (w32font_booleans, w32font_non_booleans): New variables.
9 (w32font_filter_properties): New function.
10 (w32font_driver): Add w32font_filter_properties.
11
122010-10-14 Juanma Barranquero <lekktu@gmail.com>
13
14 * font.c (Ffont_variation_glyphs):
15 * ccl.c (Fccl_execute_on_string): Fix typo in docstring.
16
12010-10-14 Juanma Barranquero <lekktu@gmail.com> 172010-10-14 Juanma Barranquero <lekktu@gmail.com>
2 18
3 * w32fns.c (w32_wnd_proc, file_dialog_callback): 19 * w32fns.c (w32_wnd_proc, file_dialog_callback):