import gdb-19990422 snapshot

[deliverable/binutils-gdb.git] / gdb / utils.c

diff --git a/gdb/utils.c b/gdb/utils.c
index 81c4452c6e710dd5b8e5a0fe59af1e0005d7b1d7..08b801b97598d2ec328832493030246a945d2d2e 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -1377,9 +1377,10 @@ init_page_info()
            if (status > 0)
              {
                int val;
+               int running_in_emacs = getenv ("EMACS") != NULL;
            
                val = tgetnum ("li");
-               if (val >= 0)
+               if (val >= 0 && !running_in_emacs)
                  lines_per_page = val;
                else
                  /* The number of lines per page is not mentioned
@@ -2241,11 +2242,9 @@ fprintf_symbol_filtered (stream, name, lang, arg_mode)
            case language_cplus:
              demangled = cplus_demangle (name, arg_mode);
              break;
-                               /* start-sanitize-java */
            case language_java:
              demangled = cplus_demangle (name, arg_mode | DMGL_JAVA);
              break;
-                               /* end-sanitize-java */
            case language_chill:
              demangled = chill_demangle (name);
              break;