diff options
| author | Tom Tromey <tom@tromey.com> | 2019-07-02 17:31:44 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-07-17 12:19:25 -0600 |
| commit | ca5af91ed271a12200bb40ccfaaede4baef6f5fe (patch) | |
| tree | 57a33ca1063784e4115476a88c6ef8a01f7d2ea2 | |
| parent | 5104fe361d818a46b262b5d504f3d293c9a2b44a (diff) | |
Fix an error in parse_scrolling_args
parse_scrolling_args combines two errors into one message, which also
happens to end with a newline. This separates the errors and fixes
the message.
gdb/ChangeLog
2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-win.c (parse_scrolling_args): Throw separate errors.
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/tui/tui-win.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 77a9f9e86eb..aff8c75a0a9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2019-07-17 Tom Tromey <tom@tromey.com> + * tui/tui-win.c (parse_scrolling_args): Throw separate errors. + +2019-07-17 Tom Tromey <tom@tromey.com> + * tui/tui-winsource.h (struct tui_exec_info_window) (struct tui_source_window_base): Move from tui-data.h. * tui/tui-winsource.c: Move many method definitions from diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 1e02c42dbd1..db4dc1088a6 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -1391,10 +1391,10 @@ parse_scrolling_args (const char *arg, *win_to_scroll = tui_partial_win_by_name (wname); - if (*win_to_scroll == NULL - || !(*win_to_scroll)->is_visible) - error (_("Invalid window specified. \n\ -The window name specified must be valid and visible.\n")); + if (*win_to_scroll == NULL) + error (_("Unrecognized window `%s'"), wname); + if (!(*win_to_scroll)->is_visible) + error (_("Window is not visible")); else if (*win_to_scroll == TUI_CMD_WIN) *win_to_scroll = tui_source_windows ()[0]; } |