* 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.

5 files changed, 27 insertions, 8 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d4dd055..02b8fd2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+Thu Apr 21 07:45:49 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* 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.
+
 Thu Apr 21 09:29:37 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 	* dbxread.c (read_dbx_dynamic_symtab):  Reinstall support for sun3,
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index b166291..28cbeeb 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -2238,7 +2238,7 @@ watch_command (arg, from_tty)
       b->watchpoint_frame = FRAME_FP (frame);
     }
   else
-    b->watchpoint_frame = NULL;
+    b->watchpoint_frame = (CORE_ADDR)0;
 
   if (can_use_hardware_watchpoint (b))
     b->type = bp_hardware_watchpoint;
diff --git a/gdb/defs.h b/gdb/defs.h
index 0fdc8a6..f86b46d 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -219,9 +219,6 @@ query ();
 /* Annotation stuff.  */
 
 extern int annotation_level; /* in stack.c */
-
-/* in printcmd.c */
-extern void print_value_flags PARAMS ((struct type *));
 
 extern void
 begin_line PARAMS ((void));
diff --git a/gdb/main.c b/gdb/main.c
index 69c36ef..83cbde9 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -1730,10 +1730,9 @@ command_line_input (prrompt, repeat)
 
   while (1)
     {
-      /* Reports are that some Sys V's don't flush gdb_stdout/err on reads
-	 from stdin, when stdin/out are sockets rather than ttys.  So we
-	 have to do it ourselves, to make emacs-gdb and xxgdb work.
-	 On other machines, doing this once per input should be a cheap nop.  */
+      /* Make sure that all output has been output.  Some machines may let
+	 you get away with leaving out some of the gdb_flush, but not all.  */
+      wrap_here ("");
       gdb_flush (gdb_stdout);
       gdb_flush (gdb_stderr);
 
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);
 }