* xterm.c (XTread_socket): Turn off ControlMask for XLookupString.

	* keyboard.c (make_lispy_event): Controlify here.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 50927c92663..66251846cb9 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2829,6 +2829,10 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
               modifiers = event.xkey.state;
 
               /* This will have to go some day...  */
+
+              /* make_lispy_event turns chars into control chars.
+                 Don't do it here because XLookupString is too eager.  */
+              event.xkey.state &= ~ControlMask;
               nbytes =
                 XLookupString (&event.xkey, copy_buffer, 80, &keysym,
                                &compose_status);