summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-12-07 14:10:37 +0100
committerBram Moolenaar <Bram@vim.org>2018-12-07 14:10:37 +0100
commit9a8534673acd98d7398c967fe4348df63e689dab (patch)
tree3988c892561d96f933c858af19e63211c4bdb5dd
parent4087bfd96d0d70791a1572ac4b40d5a655e2166b (diff)
downloadvim-git-9a8534673acd98d7398c967fe4348df63e689dab.tar.gz
patch 8.1.0568: error message for NUL byte in ScreenLines breaks Travis CIv8.1.0568
Problem: Error message for NUL byte in ScreenLines breaks Travis CI. Solution: Use a normal message fornow.
-rw-r--r--src/gui.c9
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/src/gui.c b/src/gui.c
index 9291366e1..2f3bafc97 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -2758,9 +2758,14 @@ gui_redraw_block(
if (col1 > 0)
--col1;
else
+ {
// FIXME: how can the first character ever be zero?
- IEMSGN("INTERNAL ERROR: NUL in ScreenLines in row %ld",
- gui.row);
+ // Make this IEMSGN when it no longer breaks Travis CI.
+ vim_snprintf((char *)IObuff, IOSIZE,
+ "INTERNAL ERROR: NUL in ScreenLines in row %ld",
+ (long)gui.row);
+ msg(IObuff);
+ }
}
# ifdef FEAT_GUI_GTK
if (col2 + 1 < Columns && ScreenLines[off + col2 + 1] == 0)
diff --git a/src/version.c b/src/version.c
index c4d9a8f15..eeb7cb068 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 568,
+/**/
567,
/**/
566,