patch 8.0.0524: folds messed up
Problem: Folds are messed up when 'encodin' is "utf-8".
Solution: Also set the fold character when it's not multi-byte.
diff --git a/src/screen.c b/src/screen.c
index ceb30e3..fbfded1 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -2700,7 +2700,10 @@
ScreenLines[off + col] = 0x80; /* avoid storing zero */
}
else
+ {
ScreenLinesUC[off + col] = 0;
+ ScreenLines[off + col] = fill_fold;
+ }
col++;
}
else
diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim
index 4253b56..48b7a23 100644
--- a/src/testdir/test_display.vim
+++ b/src/testdir/test_display.vim
@@ -54,6 +54,16 @@
\ " 14 \u2502",
\ ]
call assert_equal(expect, lines)
+
+ set fillchars=fold:-,vert:\|
+ let lines=ScreenLines([1,3], winwidth(0)+1)
+ let expect=[
+ \ " 1 |",
+ \ "+ +-- 12 lines: 2". repeat("-", 23). "|",
+ \ " 14 |",
+ \ ]
+ call assert_equal(expect, lines)
+
set foldtext& fillchars& foldmethod& fdc&
bw!
endfunc
diff --git a/src/version.c b/src/version.c
index c3f1189..f490deb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 524,
+/**/
523,
/**/
522,