Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1028

2 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0645765cdde..a9404d8bd58 100644
--- 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.
diff --git a/src/keyboard.c b/src/keyboard.c
index fb6bec2cad8..8afc81554ae 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2354,6 +2354,9 @@ make_ctrl_char (c)
   /* Save the upper bits here.  */
   int upper = c & ~0177;
 
+  if (! ASCII_BYTE_P (c))
+    return c |= ctrl_modifier;
+
   c &= 0177;
 
   /* Everything in the columns containing the upper-case letters