From 7f9283bf66259579b2da5fd407b078147e9ed798 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Manuel=20L=C3=B3pez-Ib=C3=A1=C3=B1ez?= Date: Tue, 2 Dec 2014 23:16:21 +0000 Subject: [PATCH] libcpp uses diagnostic->override_column to give a custom column number to diagnostics. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit libcpp uses diagnostic->override_column to give a custom column number to diagnostics. This is taken into account when building the prefix, but it was missing when placing the caret. 2014-12-03 Manuel López-Ibáñez * diagnostic.c (diagnostic_show_locus): Honor override_column when placing the caret. From-SVN: r218295 --- gcc/ChangeLog | 5 +++++ gcc/diagnostic.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b2eb9506485..ceb9e108a9f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2014-12-03 Manuel López-Ibáñez + + * diagnostic.c (diagnostic_show_locus): Honor override_column when + placing the caret. + 2014-12-02 Dmitry Vyukov * asan.c: (asan_finish_file): Use default priority for constructors diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c index f7f8aaa23c0..0c8fbe5f766 100644 --- a/gcc/diagnostic.c +++ b/gcc/diagnostic.c @@ -310,6 +310,8 @@ diagnostic_show_locus (diagnostic_context * context, context->last_location = diagnostic->location; s = expand_location_to_spelling_point (diagnostic->location); + if (diagnostic->override_column) + s.column = diagnostic->override_column; line = location_get_source_line (s, &line_width); if (line == NULL || s.column > line_width) return; -- 2.30.2