patch 8.0.0518: bad fold text when a multi-byte char has a zero byte commit https://github.com/vim/vim/commit/c6cd8409c2993b1476e123fba11cb4b8d743b896 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Mar 29 14:40:47 2017 +0200 patch 8.0.0518: bad fold text when a multi-byte char has a zero byte Problem: Storing a zero byte from a multi-byte character causes fold text to show up wrong. Solution: Avoid putting zero in ScreenLines. (Christian Brabandt, closes #1567)

--- a/src/screen.c
+++ b/src/screen.c
@@ -2697,12 +2697,15 @@ fold_line(
 	    {
 		ScreenLinesUC[off + col] = fill_fold;
 		ScreenLinesC[0][off + col] = 0;
+                ScreenLines[off + col] = 0x80; /* avoid storing zero */
 	    }
 	    else
 		ScreenLinesUC[off + col] = 0;
-	}
-#endif
-	ScreenLines[off + col++] = fill_fold;
+	    col++;
+	}
+	else
+#endif
+	    ScreenLines[off + col++] = fill_fold;
     }
 
     if (text != buf)