diff options
| author | Tom Tromey <tromey@adacore.com> | 2019-05-08 10:35:09 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2019-05-08 10:35:09 -0600 |
| commit | ca1df239078318425cf8038995bf02f1b9ab6e50 (patch) | |
| tree | 9ae5451e61cf0132f04e9da9b4012b0c1eb4d30b /gdb | |
| parent | 99f20f08682ecc7be882774ff78409530802d000 (diff) | |
| download | gdb-ca1df239078318425cf8038995bf02f1b9ab6e50.zip gdb-ca1df239078318425cf8038995bf02f1b9ab6e50.tar.gz gdb-ca1df239078318425cf8038995bf02f1b9ab6e50.tar.bz2 | |
Fix build problem in fputs_maybe_filtered
When merging commit 99f20f ("Fix style bug when paging") to master, I
had to make some changes to get it to compile again. Unfortunately, I
must not have added these to the index at the correct time, because
they were not committed.
This patch fixes the problem.
gdb/ChangeLog
2019-05-08 Tom Tromey <tromey@adacore.com>
* utils.c (fputs_maybe_filtered): Call can_emit_style_escape as a
method.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/utils.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ca20a7c..ec2424a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2019-05-08 Tom Tromey <tromey@adacore.com> + * utils.c (fputs_maybe_filtered): Call can_emit_style_escape as a + method. + +2019-05-08 Tom Tromey <tromey@adacore.com> + * utils.c (fputs_maybe_filtered): Reset style after paging, even when no wrap column is set. diff --git a/gdb/utils.c b/gdb/utils.c index 10fa5bc..9686927 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1826,7 +1826,7 @@ fputs_maybe_filtered (const char *linebuffer, struct ui_file *stream, + (save_chars - wrap_column); wrap_column = 0; /* And disable fancy wrap */ } - else if (did_paginate && can_emit_style_escape (stream)) + else if (did_paginate && stream->can_emit_style_escape ()) emit_style_escape (save_style, stream); } } |