2011-09-06 Pedro Alves <pedro@codesourcery.com>

	* event-top.h (MAXPROMPTS, struct prompts): Delete.
	(set_async_annotation_level, set_async_prompt, pop_prompt)
	(push_prompt, new_async_prompt): Delete declarations.
	* top.h (get_prompt, set_prompt): Change prototype.
	(get_prefix, set_prefix, get_suffix, set_suffix): Delete
	declarations.
	* top.c (command_loop):
	(top_prompt): New global.
	(get_prefix, set_prefix, get_suffix, ): Delete.
	(get_prompt, set_prompt): Rewrite.
	(show_new_async_prompt): Rename to ...
	(show_prompt): ... this.
	(init_main): Adjust.  Don't handle --annotate=2 here.
	* event-top.c (new_async_prompt): Delete.
	(the_prompts): Delete.
	(more_to_come): Make static.
	(display_gdb_prompt): Use top_level_prompt() to compute the top
	level prompt, and don't notify the before_prompt observers
	directly here.  Always trick readline into not trying to display
	the prompt if sync_execution and displaying the primary prompt.
	If displaying a local/secondary prompt, always show it, even if
	sync_execution is set.
	(change_annotation_level): Delete.
	(top_level_prompt): New, based on change_annotation_level.
	(push_prompt, pop_prompt): Delete.
	(async_disable_stdin): No longer pushes prompt.
	(command_line_handler): No longer pushes or pops prompt.  If more
	input is expected, call display_gdb_prompt with an explicit empty
	prompt.
	(async_stop_sig): Adjust.
	(set_async_annotation_level, set_async_prompt): Delete.
	* python/python.c (before_prompt_hook): Adjust.

1 files changed, 3 insertions, 19 deletions

diff --git a/gdb/top.h b/gdb/top.h
index 3c1ec14..e36201c 100644
--- a/gdb/top.h
+++ b/gdb/top.h
@@ -51,27 +51,11 @@ extern struct cleanup *prepare_execute_command (void);
 
 /* This function returns a pointer to the string that is used
    by gdb for its command prompt.  */
-extern char *get_prompt (int);
-
-/* This function copies the specified string into the string that
-   is used by gdb for its command prompt.  */
-extern void set_prompt (const char *, int level);
-
-/* This function returns a pointer to the string that is used
-   by gdb for its command prompt prefix.  */
-extern char *get_prefix (int);
-
-/* This function copies the specified string into the string that
-   is used by gdb for its command prompt prefix.  */
-extern void set_prefix (const char *, int);
+extern char *get_prompt (void);
 
 /* This function returns a pointer to the string that is used
-   by gdb for its command prompt suffix.  */
-extern char *get_suffix (int);
-
-/* This function copies the specified string into the string that
-   is used by gdb for its command prompt suffix.  */
-extern void set_suffix (const char *, int);
+   by gdb for its command prompt.  */
+extern void set_prompt (const char *s);
 
 /* From random places.  */
 extern int readnow_symbol_files;