Index: breakpoint.c
===================================================================
RCS file: /cvs/src/src/gdb/breakpoint.c,v
retrieving revision 1.478
diff -p -r1.478 breakpoint.c
*** breakpoint.c	5 Apr 2010 10:07:30 -0000	1.478
--- breakpoint.c	5 Apr 2010 23:17:37 -0000
*************** breakpoint_commands (struct breakpoint *
*** 241,246 ****
--- 241,248 ----
    return b->commands ? b->commands->commands : NULL;
  }
  
+ static void default_collect_info (void);
+ 
  /* Flag indicating that a command has proceeded the inferior past the
     current breakpoint.  */
  
*************** breakpoints_info (char *bnum_exp, int fr
*** 5061,5066 ****
--- 5063,5070 ----
      bnum = parse_and_eval_long (bnum_exp);
  
    breakpoint_1 (bnum, 0, NULL);
+ 
+   default_collect_info ();
  }
  
  static void
*************** maintenance_info_breakpoints (char *bnum
*** 5091,5096 ****
--- 5095,5102 ----
      bnum = parse_and_eval_long (bnum_exp);
  
    breakpoint_1 (bnum, 1, NULL);
+ 
+   default_collect_info ();
  }
  
  static int
*************** tracepoints_info (char *tpnum_exp, int f
*** 10463,10470 ****
--- 10469,10497 ----
        else
  	ui_out_message (uiout, 0, "No tracepoint number %d.\n", tpnum);
      }
+ 
+   default_collect_info ();
  }
  
+ /* Display the value of default-collect in a way that is generally
+    compatible with the breakpoint list.  */
+ 
+ void
+ default_collect_info (void)
+ {
+   /* If it has no value (which is frequently the case), say nothing; a
+      message like "No default-collect." gets in user's face when it's
+      not wanted.  */
+   if (!*default_collect)
+     return;
+ 
+   /* The following phrase lines up nicely with per-tracepoint collect
+      actions.  */
+   ui_out_text (uiout, "default collect ");
+   ui_out_field_string (uiout, "default-collect", default_collect);
+   ui_out_text (uiout, " \n");
+ }
+   
  /* The 'enable trace' command enables tracepoints.  
     Not supported by all targets.  */
  static void