aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2023-04-13 00:18:12 +0200
committerTom de Vries <tdevries@suse.de>2023-04-13 00:18:12 +0200
commit22e59dae5956999402d8d9b798412b90bf3b4d9c (patch)
tree31d9da5fa227d3d1c33ebf2b5f99179e67d487a6
parent5479c4c7c9e7179d95c6520cdef98ae175874cab (diff)
downloadgdb-22e59dae5956999402d8d9b798412b90bf3b4d9c.zip
gdb-22e59dae5956999402d8d9b798412b90bf3b4d9c.tar.gz
gdb-22e59dae5956999402d8d9b798412b90bf3b4d9c.tar.bz2
[gdb/tui] Revert workaround in tui_source_window::show_line_number
The m_digits member of tui_source_window is documented as having semantics: ... /* How many digits to use when formatting the line number. This includes the trailing space. */ ... The commit 1b6d4bb2232 ("Redraw both spaces between line numbers and source code") started printing two trailing spaces instead: ... - xsnprintf (text, sizeof (text), "%*d ", m_digits - 1, lineno); + xsnprintf (text, sizeof (text), "%*d ", m_digits - 1, lineno); ... Now that PR30325 is fixed, this no longer has any effect. Fix this by reverting to the original behaviour: print one trailing space char. Tested on x86_64-linux. Approved-By: Tom Tromey <tom@tromey.com>
-rw-r--r--gdb/tui/tui-source.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index aa3e584..3d08ea8 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -232,11 +232,9 @@ tui_source_window::show_line_number (int offset) const
{
int lineno = m_content[0].line_or_addr.u.line_no + offset;
char text[20];
- /* To completely overwrite the previous border when the source window height
- is increased, both spaces after the line number have to be redrawn. */
char space = tui_left_margin_verbose ? '_' : ' ';
xsnprintf (text, sizeof (text),
- tui_left_margin_verbose ? "%0*d%c%c" : "%*d%c%c", m_digits - 1,
- lineno, space, space);
+ tui_left_margin_verbose ? "%0*d%c" : "%*d%c", m_digits - 1,
+ lineno, space);
waddstr (handle.get (), text);
}