From 24b73f8e74857245c0a7ea07c2a360237abcdfc0 Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Thu, 23 Apr 2015 19:28:32 -0400 Subject: [PATCH] Disable readline's SIGWINCH handler We no longer need it as we handle SIGWINCH ourselves. Also move the call to init_page_info() from initialize_utils() to the latter function's only caller, gdb_init(). gdb/ChangeLog: * utils.c (init_page_info): Set rl_catch_sigwinch to zero. (initialize_utils): Move call of init_page_info() to ... * top.c (gdb_init): ... here. --- gdb/ChangeLog | 6 ++++++ gdb/top.c | 2 ++ gdb/utils.c | 5 +++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e669e098f6..7d0e7e9563 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2015-04-28 Patrick Palka + + * utils.c (init_page_info): Set rl_catch_sigwinch to zero. + (initialize_utils): Move call of init_page_info() to ... + * top.c (gdb_init): ... here. + 2015-04-28 Patrick Palka * tui/tui-win.c (tui_sigwinch_handler): Remove now-stale comment. diff --git a/gdb/top.c b/gdb/top.c index 647d9fb920..ddf5415e09 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -1939,6 +1939,8 @@ gdb_init (char *argv0) initialize_targets (); /* Setup target_terminal macros for utils.c. */ initialize_utils (); /* Make errors and warnings possible. */ + init_page_info (); + /* Here is where we call all the _initialize_foo routines. */ initialize_all_files (); diff --git a/gdb/utils.c b/gdb/utils.c index 70708bfd25..aaaf9c5d67 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1696,6 +1696,9 @@ init_page_info (void) #endif } + /* We handle SIGWINCH ourselves. */ + rl_catch_sigwinch = 0; + set_screen_size (); set_width (); } @@ -2712,8 +2715,6 @@ Setting this to \"unlimited\" or zero causes GDB never pause during output."), show_lines_per_page, &setlist, &showlist); - init_page_info (); - add_setshow_boolean_cmd ("pagination", class_support, &pagination_enabled, _("\ Set state of GDB output pagination."), _("\ -- 2.34.1