Merge from emacs--rel--22

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 0645765cddee3c176d7de5ad0824651fc852c4f7..a9404d8bd586e9b21ad311322cea926d46a45847 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-31  Kenichi Handa  <handa@ni.aist.go.jp>
+
+       * keyboard.c (make_ctrl_char): If C is a multibyte character, just
+       return it ORed with ctrl_modifier.
+
 2008-01-29  Miles Bader  <miles@gnu.org>
 
        * macterm.c (XTset_vertical_scroll_bar): Fix merge mistake.