Permalink
Browse files

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.
  • Loading branch information...
brammool committed Mar 29, 2017
1 parent bf3d580 commit 8da1e6cedf839902e15987a98733ebd31b5f1b81
Showing with 15 additions and 0 deletions.
  1. +3 −0 src/screen.c
  2. +10 −0 src/testdir/test_display.vim
  3. +2 −0 src/version.c
View
@@ -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
@@ -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
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 524,
/**/
523,
/**/

0 comments on commit 8da1e6c

Please sign in to comment.