diff -pur gdb-6.6.orig/gdb/tui/tui.c gdb-6.6/gdb/tui/tui.c
--- gdb-6.6.orig/gdb/tui/tui.c	2005-12-23 11:10:03.000000000 -0800
+++ gdb-6.6/gdb/tui/tui.c	2007-05-16 14:21:11.000000000 -0700
@@ -75,12 +75,14 @@ static const struct tui_char_command tui
   { 'c', "continue" },
   { 'd', "down" },
   { 'f', "finish" },
+  { 'i', "stepi" },
   { 'n', "next" },
   { 'r', "run" },
   { 's', "step" },
   { 'u', "up" },
   { 'v', "info locals" },
   { 'w', "where" },
+  { 'x', "nexti" },
   { 0, 0 },
 };
 
@@ -349,7 +351,6 @@ tui_initialize_readline (void)
   rl_bind_key_in_map ('2', tui_rl_change_windows, tui_ctlx_keymap);
   rl_bind_key_in_map ('o', tui_rl_other_window, emacs_ctlx_keymap);
   rl_bind_key_in_map ('o', tui_rl_other_window, tui_ctlx_keymap);
-  rl_bind_key_in_map ('q', tui_rl_next_keymap, tui_keymap);
   rl_bind_key_in_map ('s', tui_rl_next_keymap, emacs_ctlx_keymap);
   rl_bind_key_in_map ('s', tui_rl_next_keymap, tui_ctlx_keymap);
 }