X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcp-support.c;h=5662f86249763aff3bbae1b7ba1fe83acdddb5c0;hb=f166f943f30a91792e8754cbca9d7652fc400aae;hp=a71c6ad722743d982bd07869e08176e07388dda9;hpb=1cafadb4e4eb329dea01355c6632b3077113d80c;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index a71c6ad722..5662f86249 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -34,7 +34,7 @@
 #include "cp-abi.h"
 #include "namespace.h"
 #include <signal.h>
-
+#include "gdb_setjmp.h"
 #include "safe-ctype.h"
 
 #define d_left(dc) (dc)->u.s_binary.left
@@ -1601,7 +1601,9 @@ gdb_demangle (const char *name, int options)
 				    "demangler-warning", short_msg);
 	      make_cleanup (xfree, long_msg);
 
-	      target_terminal_ours ();
+	      make_cleanup_restore_target_terminal ();
+	      target_terminal_ours_for_output ();
+
 	      begin_line ();
 	      if (core_dump_allowed)
 		fprintf_unfiltered (gdb_stderr,