* main.c (captured_main): Print a newline after calling

	print_gdb_version instead of waiting until after the symbol file
	has been read.  Adjust error_pre_print, quit_pre_print, and
	warning_pre_print values.

2 files changed, 11 insertions, 12 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 55318a8..4b0ae0e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-27  Bob Wilson  <bob.wilson@acm.org>
+
+	* main.c (captured_main): Print a newline after calling
+	print_gdb_version instead of waiting until after the symbol file
+	has been read.  Adjust error_pre_print, quit_pre_print, and
+	warning_pre_print values.
+
 2006-07-27  Roger Sayle  <roger@eyesopen.com>
 	    Daniel Jacobowitz  <dan@codesourcery.com>
 
diff --git a/gdb/main.c b/gdb/main.c
index b659972..ce6070f 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -589,6 +589,7 @@ extern int gdbtk_test (char *);
       if (symarg)
 	printf_filtered ("..");
       wrap_here ("");
+      printf_filtered ("\n");
       gdb_flush (gdb_stdout);	/* Force to screen during slow operations */
     }
 
@@ -623,13 +624,13 @@ extern int gdbtk_test (char *);
       if (symarg)
 	printf_filtered ("..");
       wrap_here ("");
+      printf_filtered ("\n");
       gdb_flush (gdb_stdout);	/* Force to screen during slow operations */
     }
 
-  error_pre_print = "\n\n";
+  /* Set off error and warning messages with a blank line.  */
+  error_pre_print = "\n";
   quit_pre_print = error_pre_print;
-
-  /* We may get more than one warning, don't double space all of them... */
   warning_pre_print = _("\nwarning: ");
 
   /* Read and execute $HOME/.gdbinit file, if it exists.  This is done
@@ -688,15 +689,6 @@ extern int gdbtk_test (char *);
 	catch_command_errors (symbol_file_add_main, symarg, 0, RETURN_MASK_ALL);
     }
 
-  /* After the symbol file has been read, print a newline to get us
-     beyond the copyright line...  But errors should still set off
-     the error message with a (single) blank line.  */
-  if (!quiet)
-    printf_filtered ("\n");
-  error_pre_print = "\n";
-  quit_pre_print = error_pre_print;
-  warning_pre_print = _("\nwarning: ");
-
   if (corearg != NULL)
     {
       /* corearg may be either a corefile or a pid.