* breakpoint.c (watch_command): Use (CORE_ADDR)0, not NULL, for

	target null pointer.
	* blockframe.c (find_frame_addr_in_frame_chain): Likewise.

	* printcmd.c (output_command): Annotate things we print here too.
	* Move declaration of print_value_flags from defs.h to value.h.
	* main.c (command_line_input): Call wrap_here as well as gdb_flush.

1 files changed, 13 insertions, 0 deletions

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 9cf224c..981cf59 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -839,6 +839,9 @@ print_command_1 (exp, inspect, voidprint)
       else
 	if (histindex >= 0) printf_filtered ("$%d = ", histindex);
 
+      if (annotation_level > 1 && histindex >= 0)
+	printf_filtered ("\n\032\032value-history-value\n");
+
       print_formatted (val, format, fmt.size);
       printf_filtered ("\n");
 
@@ -915,8 +918,18 @@ output_command (exp, from_tty)
 
   val = evaluate_expression (expr);
 
+  if (annotation_level > 1)
+    {
+      printf_filtered ("\n\032\032value-begin ");
+      print_value_flags (VALUE_TYPE (val));
+      printf_filtered ("\n");
+    }
+
   print_formatted (val, format, fmt.size);
 
+  if (annotation_level > 1)
+    printf_filtered ("\n\032\032value-end\n");
+
   do_cleanups (old_chain);
 }