public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Fix build problem in fputs_maybe_filtered
@ 2019-05-08 16:37 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2019-05-08 16:37 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ca1df239078318425cf8038995bf02f1b9ab6e50
commit ca1df239078318425cf8038995bf02f1b9ab6e50
Author: Tom Tromey <tromey@adacore.com>
Date: Wed May 8 10:35:09 2019 -0600
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.
Diff:
---
gdb/ChangeLog | 5 +++++
gdb/utils.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
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);
}
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-05-08 16:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-08 16:37 [binutils-gdb] Fix build problem in fputs_maybe_filtered Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).