# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 737763854 0
# Node ID 5b72eb2483e77925947f445fb84fa39417b97b4a
# Parent  48ddb3600ae66e750a0f29ac5307a8127a272a36
	* xterm.c (XTread_socket): Turn off ControlMask for XLookupString.
	* keyboard.c (make_lispy_event): Controlify here.

diff -r 48ddb3600ae6 -r 5b72eb2483e7 src/keyboard.c
--- a/src/keyboard.c	Tue May 18 22:15:14 1993 +0000
+++ b/src/keyboard.c	Tue May 18 22:24:14 1993 +0000
@@ -2090,11 +2090,16 @@
     case ascii_keystroke:
       {
 	int c = XFASTINT (event->code);
-	/* Include the bits for control and shift
-	   only if the basic ASCII code can't indicate them.  */
-	if ((event->modifiers & ctrl_modifier)
-	    && c >= 040)
-	  c |= ctrl_modifier;
+	/* Turn ASCII characters into control characters
+	   when proper.  */
+	if (event->modifiers & ctrl_modifier)
+	  {
+	    if (c >= 0100 && c < 0140)
+	      c &= ~040;
+	    /* Include the bits for control and shift
+	       only if the basic ASCII code can't indicate them.  */
+	    c |= ctrl_modifier;
+	  }
 	/* Set the shift modifier for a control char
 	   made from a shifted letter.  But only for letters!  */
 	if (XFASTINT (event->code) >= 'A' - 0100