Merge from emacs-23; up to 2012-01-19T07:15:48Z!rgm@gnu.org.

[bpt/emacs.git] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index aa4e92b..3a6e31e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-19  Kenichi Handa  <handa@m17n.org>
+
+       * character.c (char_width): New function.
+       (Fchar_width, c_string_width, lisp_string_width):
+       Use char_width (Bug#9496).
+
 2012-01-16  Martin Rudalics  <rudalics@gmx.at>
 
        * window.c (Vwindow_persistent_parameters): New variable.