diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/tui/tui-wingeneral.c | 7 | ||||
| -rw-r--r-- | gdb/tui/tui-winsource.c | 6 |
3 files changed, 15 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ed2856c..735c46b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-01-11 Tom Tromey <tom@tromey.com> + + * tui/tui-wingeneral.c (box_win): Check cli_styling. + * tui/tui-winsource.c (tui_source_window_base::refill): Use + deprecated_safe_get_selected_frame. + 2020-01-10 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> * inferior.c (print_inferior): Switch inferior before printing it. diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c index dae4255..0a9fc52 100644 --- a/gdb/tui/tui-wingeneral.c +++ b/gdb/tui/tui-wingeneral.c @@ -55,9 +55,10 @@ box_win (struct tui_win_info *win_info, /* tui_apply_style resets the style entirely, so be sure to call it before applying ATTRS. */ - tui_apply_style (win, (highlight_flag - ? tui_active_border_style.style () - : tui_border_style.style ())); + if (cli_styling) + tui_apply_style (win, (highlight_flag + ? tui_active_border_style.style () + : tui_border_style.style ())); wattron (win, attrs); #ifdef HAVE_WBORDER wborder (win, tui_border_vline, tui_border_vline, diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 6907011..fbee2e3 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -352,7 +352,11 @@ tui_source_window_base::refill () { sal = get_current_source_symtab_and_line (); if (sal.symtab == NULL) - sal = find_pc_line (get_frame_pc (get_selected_frame (NULL)), 0); + { + struct frame_info *fi = deprecated_safe_get_selected_frame (); + if (fi != nullptr) + sal = find_pc_line (get_frame_pc (fi), 0); + } } if (sal.pspace == nullptr) |