* fhandler_console.cc (fhandler_console::read): Don't generate ^@ on

	Ctrl+Alt+Space.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 6b9d56f..bd87fd3 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-24  Corinna Vinschen  <corinna@vinschen.de>
+
+       * fhandler_console.cc (fhandler_console::read): Don't generate ^@ on
+       Ctrl+Alt+Space.
+
 2011-06-22  Corinna Vinschen  <corinna@vinschen.de>
 
        * fhandler_tty.cc (fhandler_pty_master::setup): Create pty pipes

diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index ce036a3..eb4a41f 100644 (file)
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -457,7 +457,8 @@ restart:
            }
          /* Allow Ctrl-Space to emit ^@ */
          else if (input_rec.Event.KeyEvent.wVirtualKeyCode == VK_SPACE
-                  && (control_key_state & CTRL_PRESSED))
+                  && (control_key_state & CTRL_PRESSED)
+                  && !(control_key_state & ALT_PRESSED))
            toadd = "";
          else if (wch == 0
              /* arrow/function keys */