Mercurial > vim

changeset 15115:f17110dae9de v8.1.0568

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0568: error message for NUL byte in ScreenLines breaks Travis CI commit https://github.com/vim/vim/commit/9a8534673acd98d7398c967fe4348df63e689dab Author: Bram Moolenaar <Bram@vim.org> Date: Fri Dec 7 14:10:37 2018 +0100 patch 8.1.0568: error message for NUL byte in ScreenLines breaks Travis CI Problem: Error message for NUL byte in ScreenLines breaks Travis CI. Solution: Use a normal message fornow.
author Bram Moolenaar <Bram@vim.org>
date Fri, 07 Dec 2018 14:15:05 +0100
parents 87237010fcf9
children 80ba0405fcd2
files src/gui.c src/version.c
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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,