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.

diff --git a/src/gui.c b/src/gui.c
index 9291366e12452d14f92c0f8dcc12ae9c99f60cc8..2f3bafc97d416f756afc0d07e00c4ea12c67f413 100644 (file)
--- 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 c4d9a8f15096aab024a6a0e759cd0bba2fdc6a21..eeb7cb0688f22f04e5cf878d0ee81bfe06157428 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    568,
 /**/
     567,
 /**/