patch 9.0.0650: some tests are failing
Problem: Some tests are failing.
Solution: Adjust for "<<<" showing up.
diff --git a/src/testdir/test_breakindent.vim b/src/testdir/test_breakindent.vim
index f052fb7..5ac88a0 100644
--- a/src/testdir/test_breakindent.vim
+++ b/src/testdir/test_breakindent.vim
@@ -83,7 +83,7 @@
CheckFeature vartabs
" simple breakindent test with showbreak set
call s:test_windows('setl briopt=min:0 sbr=>> vts=4')
- let lines = s:screen_lines(line('.'),8)
+ let lines = s:screen_lines(line('.'), 8)
let expect = [
\ " abcd",
\ " >>qr",
@@ -96,7 +96,7 @@
func Test_breakindent03()
" simple breakindent test with showbreak set and briopt including sbr
call s:test_windows('setl briopt=sbr,min:0 sbr=++')
- let lines = s:screen_lines(line('.'),8)
+ let lines = s:screen_lines(line('.'), 8)
let expect = [
\ " abcd",
\ "++ qrst",
@@ -111,7 +111,7 @@
" simple breakindent test with showbreak set and briopt including sbr
CheckFeature vartabs
call s:test_windows('setl briopt=sbr,min:0 sbr=++ vts=4')
- let lines = s:screen_lines(line('.'),8)
+ let lines = s:screen_lines(line('.'), 8)
let expect = [
\ " abcd",
\ "++ qrst",
@@ -126,7 +126,7 @@
" breakindent set with min width 18
set sbr=<<<
call s:test_windows('setl sbr=NONE briopt=min:18')
- let lines = s:screen_lines(line('.'),8)
+ let lines = s:screen_lines(line('.'), 8)
let expect = [
\ " abcd",
\ " qrstuv",
@@ -142,7 +142,7 @@
" breakindent set with min width 18
CheckFeature vartabs
call s:test_windows('setl sbr= briopt=min:18 vts=4')
- let lines = s:screen_lines(line('.'),8)
+ let lines = s:screen_lines(line('.'), 8)
let expect = [
\ " abcd",
\ " qrstuv",
@@ -549,7 +549,7 @@
redraw!
let lines = s:screen_lines(1,10)
let expect = [
- \ " 789012",
+ \ "<<< 789012",
\ " 345678",
\ " 901234",
\ ]
@@ -575,7 +575,7 @@
redraw!
let lines = s:screen_lines(1,10)
let expect = [
- \ " 789012",
+ \ "<<< 789012",
\ " 345678",
\ " 901234",
\ ]
@@ -660,7 +660,7 @@
norm! 5gj
let lines = s:screen_lines(1, 20)
let expect = [
- \ ">aaaaaaaaaaaaaaaaaaa",
+ \ "<<<aaaaaaaaaaaaaaaaa",
\ ">aaaaaaaaaaaaaaaaaaa",
\ ">aaaaaaaaaaaaaaaaaaa",
\ ]
@@ -687,7 +687,7 @@
redraw!
let lines = s:screen_lines(1, 20)
let expect = [
- \ "--1 aaaaaaaaaaaaaaaa",
+ \ "<<< aaaaaaaaaaaaaaaa",
\ " aaaaaaaaaaaaaaaa",
\ " aaaaaaaaaaaaaaaa",
\ ]
@@ -706,7 +706,7 @@
norm! 5gj
let lines = s:screen_lines(1, 20)
let expect = [
- \ "--1 aaaaaaaaaaaaaa",
+ \ "<<< aaaaaaaaaaaaaa",
\ " aaaaaaaaaaaaaa",
\ " aaaaaaaaaaaaaa",
\ ]
diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim
index af18b7e..7237ed8 100644
--- a/src/testdir/test_display.vim
+++ b/src/testdir/test_display.vim
@@ -143,7 +143,7 @@
let lines = ScreenLines([1,10], winwidth(0)+1)
let expect = [
- \ "<aaa aaa a|",
+ \ "<<<a aaa a|",
\ "a aaa aaa |",
\ "aa aaa aaa|",
\ " aa aaa aa|",
diff --git a/src/testdir/test_listlbr.vim b/src/testdir/test_listlbr.vim
index 24bd256..97d6ccd 100644
--- a/src/testdir/test_listlbr.vim
+++ b/src/testdir/test_listlbr.vim
@@ -159,7 +159,7 @@
exe "norm! $3B\<C-v>eAx\<Esc>"
let lines = s:screen_lines([1, 10], winwidth(0))
let expect = [
-\ "foobar foobar ",
+\ "<<<bar foobar ",
\ "foobar foobar ",
\ "foobar foobar ",
\ "foobar foobar ",
diff --git a/src/testdir/test_listlbr_utf8.vim b/src/testdir/test_listlbr_utf8.vim
index 0d77dbf..83d6ed0 100644
--- a/src/testdir/test_listlbr_utf8.vim
+++ b/src/testdir/test_listlbr_utf8.vim
@@ -167,7 +167,7 @@
exe "norm! $3B\<C-v>eAx\<Esc>"
let lines = s:screen_lines([1, 10], winwidth(0))
let expect = [
-\ "+foobar foobar ",
+\ "<<<obar foobar ",
\ "+foobar foobar ",
\ "+foobar foobar ",
\ "+foobar foobar ",
@@ -266,7 +266,7 @@
norm! $
redraw!
let expect=[
-\ '中aaaaaaaaaaaaaaaaa>',
+\ '<<<aaaaaaaaaaaaaaaa>',
\ '中aaaaaaaaaaaaaaaaa>',
\ '中aaaaaaaaaaaaaaaaa>',
\ '中aaaaaaaaaaaaaaaaa>',
diff --git a/src/testdir/test_number.vim b/src/testdir/test_number.vim
index e854576..81f8f73 100644
--- a/src/testdir/test_number.vim
+++ b/src/testdir/test_number.vim
@@ -138,7 +138,7 @@
call s:validate_cursor()
let lines = s:screen_lines(1, 3)
let expect = [
-\ "--1 aaaa",
+\ "<<< aaaa",
\ " aaaa",
\ " aaaa",
\ ]
diff --git a/src/version.c b/src/version.c
index 24ca413..000c1e3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 650,
+/**/
649,
/**/
648,