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 ceb30e337deb5b382a1a9eef7c4ffb8c2d5f7ce6..fbfded1a295b5e7cfef345ce2d3e892a780066f2 100644 (file)
--- 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 4253b56933f5b38d6ad29c22ee6cfb5745498890..48b7a2318e1d5674fa7c3b370c585b0bb9be076d 100644 (file)
--- 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 c3f1189367491af8e940495df2cefbbfa83581fc..f490deba10986958425695cf717072ee483a48c2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    524,
 /**/
     523,
 /**/