diff options
-rw-r--r-- | src/screen.c | 3 | ||||
-rw-r--r-- | src/testdir/test_display.vim | 10 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 0 deletions
diff --git a/src/screen.c b/src/screen.c index ceb30e337..fbfded1a2 100644 --- a/src/screen.c +++ b/src/screen.c @@ -2700,7 +2700,10 @@ fold_line( 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 4253b5693..48b7a2318 100644 --- a/src/testdir/test_display.vim +++ b/src/testdir/test_display.vim @@ -54,6 +54,16 @@ func! Test_display_foldtext_mbyte() \ " 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 c3f118936..f490deba1 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 524, +/**/ 523, /**/ 522, |