From: Kenichi Handa <handa@m17n.org>
Date: Thu, 31 Jan 2008 06:42:01 +0000 (+0000)
Subject: (make_ctrl_char): If C is a multibyte character, just
X-Git-Tag: emacs-pretest-22.1.91~116
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a32aad64df910afb931443178a6093b940477f2c;p=emacs.git

(make_ctrl_char): If C is a multibyte character, just
return it ORed with ctrl_modifier.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index eac48d83fbb..bef208cc3f9 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-26  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
 	* fns.c (Fclrhash): Return TABLE.
diff --git a/src/keyboard.c b/src/keyboard.c
index 097decb66a7..20ecf203324 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2310,6 +2310,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