Disable paging when run by Emacs 25.1 and later.

gdb/ChangeLog:

	* utils.c (init_page_info): Disable paging if INSIDE_EMACS is set
	in the environment.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 84fa7736d3d12b9ecc1716598cf289885e87df1e..000566e17fe52934db0844f69af370928f5264f0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * utils.c (init_page_info): Disable paging if INSIDE_EMACS is set
+       in the environment.
+
 2015-10-29  Pedro Alves  <palves@redhat.com>
 
        * gnu-v2-abi.c (gnuv2_is_destructor_name)

diff --git a/gdb/utils.c b/gdb/utils.c
index 255aee893b1b4b0bf3875475a782e86b11525d73..bb13522ef770171e1ccef791ab24d865f4d4706f 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -1677,8 +1677,9 @@ init_page_info (void)
          Only try to use tgetnum function if rl_get_screen_size
          did not return a useful value. */
       if (((rows <= 0) && (tgetnum ("li") < 0))
-       /* Also disable paging if inside EMACS.  */
-         || getenv ("EMACS"))
+       /* Also disable paging if inside Emacs.  $EMACS was used
+          before Emacs v25.1, $INSIDE_EMACS is used since then.  */
+         || getenv ("EMACS") || getenv ("INSIDE_EMACS"))
        {
          /* The number of lines per page is not mentioned in the terminal
             description or EMACS evironment variable is set.  This probably