* utils.c (fputs_demangled): Complete rewrite to clean up and

	add a language parameter that is used to select the demangling
	algorithm.
	* defs.h (enum language):  Move further up in file so enum can
	be used in prototypes.
	* defs.h (fputs_demangled):  Update prototype to add lang arg.
	* c-typeprint.c (cp_type_print_method_args):  Add language arg
	to fputs_demangled calls, remove DMGL_PARAMS flag.
	* stack.c (print_frame_info):  Remove obsolete code so we don't
	have to update fputs_demangled usage in it.
	* stack.c (print_frame_info, frame_info):  Add language variable
	to pass to fputs_demangled and initialize it from the symbol's
	language.  Call fputs_demangled with language arg.
	* symtab.c (find_methods):  Add language arg to fputs_demangled
	call.

1 files changed, 2 insertions, 1 deletions

diff --git a/gdb/symtab.c b/gdb/symtab.c
index 328679c..c31d7b6 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -1389,7 +1389,8 @@ find_methods (t, name, sym_arr)
 		else
 		  {
 		    fputs_filtered("(Cannot find method ", stdout);
-		    fputs_demangled(phys_name, stdout, DMGL_PARAMS);
+		    fputs_demangled(phys_name, stdout, DMGL_PARAMS,
+				    language_cplus);
 		    fputs_filtered(" - possibly inlined.)\n", stdout);
 		  }
 	      }