From f9f0f0ca7c3f8570a614e20a53449c182545b240 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Mon, 4 Jul 2016 20:46:01 +0100 Subject: [PATCH] Fix colouring of error/warning without column --- src/cavernlog.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cavernlog.cc b/src/cavernlog.cc index 58e62a16..3bf0b55b 100644 --- a/src/cavernlog.cc +++ b/src/cavernlog.cc @@ -549,7 +549,8 @@ bad_utf8: // Check for column number. while (++i < cur.size() - 2 && cur[i] >= wxT('0') && cur[i] <= wxT('9')) { } - if (i > colon + 1 && cur[i] == wxT(':') ) { + bool have_column = (i > colon + 1 && cur[i] == wxT(':')); + if (have_column) { colon = i; } else { // If there's no colon, include a trailing ':' @@ -570,6 +571,8 @@ bad_utf8: cur.insert(offset, wxT("")); offset += 4 + 2; + if (!have_column) --offset; + static const wxString & error_marker = wmsg(/*error*/93) + ":"; static const wxString & warning_marker = wmsg(/*warning*/4) + ":"; -- 2.11.4.GIT