2012-04-20 Sergio Durigan Junior <sergiodj@redhat.com>

[deliverable/binutils-gdb.git] / gdb / top.c

diff --git a/gdb/top.c b/gdb/top.c
index 346d73b4e02f726eaffc043d1a968c19838c74ad..a138480e5e43d10a4e3df463601dab087fe40f6d 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -101,10 +101,10 @@ extern char lang_frame_mismatch_warn[];           /* language.c */
 /* Flag for whether we want to confirm potentially dangerous
    operations.  Default is yes.  */
 
-int caution = 1;
+int confirm = 1;
 
 static void
-show_caution (struct ui_file *file, int from_tty,
+show_confirm (struct ui_file *file, int from_tty,
              struct cmd_list_element *c, const char *value)
 {
   fprintf_filtered (file, _("Whether to confirm potentially "
@@ -291,9 +291,9 @@ void (*deprecated_context_hook) (int id);
 /* static */ void
 quit_cover (void)
 {
-  caution = 0;                 /* Throw caution to the wind -- we're exiting.
-                                  This prevents asking the user dumb 
-                                  questions.  */
+  /* Stop asking user for confirmation --- we're exiting.  This
+     prevents asking the user dumb questions.  */
+  confirm = 0;
   quit_command ((char *) 0, 0);
 }
 #endif /* defined SIGHUP */
@@ -470,7 +470,8 @@ execute_command (char *p, int from_tty)
       if (c->flags & DEPRECATED_WARN_USER)
        deprecated_cmd_warning (&line);
 
-      if (c->class == class_user)
+      /* c->user_commands would be NULL in the case of a python command.  */
+      if (c->class == class_user && c->user_commands)
        execute_user_command (c, arg);
       else if (c->type == set_cmd || c->type == show_cmd)
        do_setshow_command (arg, from_tty, c);
@@ -1296,8 +1297,8 @@ quit_target (void *arg)
   if (write_history_p && history_filename)
     write_history (history_filename);
 
-  do_final_cleanups (ALL_CLEANUPS);    /* Do any final cleanups before
-                                         exiting.  */
+  do_final_cleanups (all_cleanups ());    /* Do any final cleanups before
+                                            exiting.  */
   return 0;
 }
 
@@ -1635,11 +1636,11 @@ Show the filename in which to record the command history"), _("\
                            show_history_filename,
                            &sethistlist, &showhistlist);
 
-  add_setshow_boolean_cmd ("confirm", class_support, &caution, _("\
+  add_setshow_boolean_cmd ("confirm", class_support, &confirm, _("\
 Set whether to confirm potentially dangerous operations."), _("\
 Show whether to confirm potentially dangerous operations."), NULL,
                           NULL,
-                          show_caution,
+                          show_confirm,
                           &setlist, &showlist);
 
   add_setshow_zinteger_cmd ("annotate", class_obscure, &annotation_level, _("\