diff options
| author | Stephane Carrez <stcarrez@nerim.fr> | 2012-11-10 13:12:18 +0000 |
|---|---|---|
| committer | Stephane Carrez <stcarrez@nerim.fr> | 2012-11-10 13:12:18 +0000 |
| commit | 9b8d6827200e1b04d3ca860ce52472655e84248c (patch) | |
| tree | 0de47fc751fdda000fe6f16745d0fd1477790e91 /gdb/tui/tui-io.c | |
| parent | e840f632eb1879fd022f88ab1e2f5ce3a41d3cbe (diff) | |
| download | binutils-gdb-9b8d6827200e1b04d3ca860ce52472655e84248c.tar.gz | |
* tui/tui.c (tui_rl_command_key): Switch to TUI_ONE_COMMAND_MODE
while executing the gdb command.
(tui_rl_startup_hook): Do not switch back to TUI_SINGLE_KEY_MODE if we
are called from prompt_for_continue.
* tui/tui-io.c (tui_redisplay_readline): Likewise.
Diffstat (limited to 'gdb/tui/tui-io.c')
| -rw-r--r-- | gdb/tui/tui-io.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index 2fb7bb436c3..29c1a2c6fb5 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -211,8 +211,11 @@ tui_redisplay_readline (void) /* Detect when we temporarily left SingleKey and now the readline edit buffer is empty, automatically restore the SingleKey - mode. */ - if (tui_current_key_mode == TUI_ONE_COMMAND_MODE && rl_end == 0) + mode. The restore must only be done if the command has finished. + The command could call prompt_for_continue and we must not + restore SingleKey so that the prompt and normal keymap are used. */ + if (tui_current_key_mode == TUI_ONE_COMMAND_MODE && rl_end == 0 + && immediate_quit == 0) tui_set_key_mode (TUI_SINGLE_KEY_MODE); if (tui_current_key_mode == TUI_SINGLE_KEY_MODE) |