2001-04-05 Elena Zannoni <ezannoni@kwikemart.cygnus.com>

        From  Jimmy Guo  <guo@cup.hp.com>
        * top.c (init_main): set prompt if annotation_level>1,
        this is necessary when annotation_level is set to 2 via
        --annotate=2 command line option.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 47b1d4c239bb8aaa07be30f1012b16fb94823bc8..c508d1e54c8691ea56c48e3adff527b5cc7dab61 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-05  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
+
+        From  Jimmy Guo  <guo@cup.hp.com>
+        * top.c (init_main): set prompt if annotation_level>1,
+        this is necessary when annotation_level is set to 2 via
+        --annotate=2 command line option.
+
 2001-04-04  Andrew Cagney  <ac131313@redhat.com>
 
        Obsolete a29k-*-* host and a29k-*-sym1* and a29k-*-kern* targets.

diff --git a/gdb/top.c b/gdb/top.c
index 8cb66536f447b8f6b9fc42178ac39e8d79c74d82..785e4a66977893d6cf8a54e0741ce064eed65acb 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -1996,6 +1996,12 @@ init_main (void)
       async_annotation_suffix = "prompt";
       /* Set the variable associated with the setshow prompt command. */
       new_async_prompt = savestring (PROMPT (0), strlen (PROMPT (0)));
+
+      /* If gdb was started with --annotate=2, this is equivalent to
+        the user entering the command 'set annotate 2' at the gdb
+        prompt, so we need to do extra processing. */
+      if (annotation_level > 1)
+        set_async_annotation_level (NULL, 0, NULL);
     }
   gdb_prompt_escape = 0;       /* default to none.  */