diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/cli/cli-script.c | 6 | ||||
| -rw-r--r-- | gdb/top.c | 4 | ||||
| -rw-r--r-- | gdb/top.h | 1 |
4 files changed, 7 insertions, 11 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 59556b4..f7ccc82 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2017-08-03 Tom Tromey <tom@tromey.com> + * top.h (in_user_command): Remove. + * top.c (in_user_command): Remove. + * cli/cli-script.c (do_restore_user_call_depth) + (execute_user_command): Update. + +2017-08-03 Tom Tromey <tom@tromey.com> + * valops.c (search_struct_method): Use gdb::byte_vector. * valarith.c (value_concat): Use std::vector. * target.c (memory_xfer_partial): Use gdb::byte_vector. diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c index a6d5456..527540a 100644 --- a/gdb/cli/cli-script.c +++ b/gdb/cli/cli-script.c @@ -379,8 +379,6 @@ do_restore_user_call_depth (void * call_depth) int *depth = (int *) call_depth; (*depth)--; - if ((*depth) == 0) - in_user_command = 0; } @@ -411,10 +409,6 @@ execute_user_command (struct cmd_list_element *c, char *args) make_cleanup (do_restore_instream_cleanup, ui->instream); ui->instream = NULL; - /* Also set the global in_user_command, so that NULL instream is - not confused with Insight. */ - in_user_command = 1; - scoped_restore save_async = make_scoped_restore (¤t_ui->async, 0); command_nest_depth++; @@ -129,10 +129,6 @@ show_confirm (struct ui_file *file, int from_tty, value); } -/* Flag to indicate whether a user defined command is currently running. */ - -int in_user_command; - /* Current working directory. */ char *current_directory; @@ -218,7 +218,6 @@ extern void ui_unregister_input_event_handler (struct ui *ui); /* From top.c. */ extern char *saved_command_line; -extern int in_user_command; extern int confirm; extern char gdb_dirbuf[1024]; extern int inhibit_gdbinit; |