Patch 9.0.0650

[Bram Moolenaar]

Patch 9.0.0650 (after 9.0.0649)
Problem: Some tests are failing.
Solution: Adjust for "<<<" showing up.
Files: src/testdir/test_breakindent.vim, src/testdir/test_display.vim,
src/testdir/test_listlbr.vim, src/testdir/test_listlbr_utf8.vim,
src/testdir/test_number.vim


*** ../vim-9.0.0649/src/testdir/test_breakindent.vim 2022-09-05 21:40:40.438306254 +0100
--- src/testdir/test_breakindent.vim 2022-10-03 16:58:48.775343152 +0100
***************
*** 83,89 ****
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 expect = [
\ " abcd",
\ " >>qr",
--- 83,89 ----
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 expect = [
\ " abcd",
\ " >>qr",
***************
*** 96,102 ****
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 expect = [
\ " abcd",
\ "++ qrst",
--- 96,102 ----
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 expect = [
\ " abcd",
\ "++ qrst",
***************
*** 111,117 ****
" 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 expect = [
\ " abcd",
\ "++ qrst",
--- 111,117 ----
" 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 expect = [
\ " abcd",
\ "++ qrst",
***************
*** 126,132 ****
" 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 expect = [
\ " abcd",
\ " qrstuv",
--- 126,132 ----
" 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 expect = [
\ " abcd",
\ " qrstuv",
***************
*** 142,148 ****
" 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 expect = [
\ " abcd",
\ " qrstuv",
--- 142,148 ----
" 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 expect = [
\ " abcd",
\ " qrstuv",
***************
*** 549,555 ****
redraw!
let lines = s:screen_lines(1,10)
let expect = [
! \ " 789012",
\ " 345678",
\ " 901234",
\ ]
--- 549,555 ----
redraw!
let lines = s:screen_lines(1,10)
let expect = [
! \ "<<< 789012",
\ " 345678",
\ " 901234",
\ ]
***************
*** 575,581 ****
redraw!
let lines = s:screen_lines(1,10)
let expect = [
! \ " 789012",
\ " 345678",
\ " 901234",
\ ]
--- 575,581 ----
redraw!
let lines = s:screen_lines(1,10)
let expect = [
! \ "<<< 789012",
\ " 345678",
\ " 901234",
\ ]
***************
*** 660,666 ****
norm! 5gj
let lines = s:screen_lines(1, 20)
let expect = [
! \ ">aaaaaaaaaaaaaaaaaaa",
\ ">aaaaaaaaaaaaaaaaaaa",
\ ">aaaaaaaaaaaaaaaaaaa",
\ ]
--- 660,666 ----
norm! 5gj
let lines = s:screen_lines(1, 20)
let expect = [
! \ "<<<aaaaaaaaaaaaaaaaa",
\ ">aaaaaaaaaaaaaaaaaaa",
\ ">aaaaaaaaaaaaaaaaaaa",
\ ]
***************
*** 687,693 ****
redraw!
let lines = s:screen_lines(1, 20)
let expect = [
! \ "--1 aaaaaaaaaaaaaaaa",
\ " aaaaaaaaaaaaaaaa",
\ " aaaaaaaaaaaaaaaa",
\ ]
--- 687,693 ----
redraw!
let lines = s:screen_lines(1, 20)
let expect = [
! \ "<<< aaaaaaaaaaaaaaaa",
\ " aaaaaaaaaaaaaaaa",
\ " aaaaaaaaaaaaaaaa",
\ ]
***************
*** 706,712 ****
norm! 5gj
let lines = s:screen_lines(1, 20)
let expect = [
! \ "--1 aaaaaaaaaaaaaa",
\ " aaaaaaaaaaaaaa",
\ " aaaaaaaaaaaaaa",
\ ]
--- 706,712 ----
norm! 5gj
let lines = s:screen_lines(1, 20)
let expect = [
! \ "<<< aaaaaaaaaaaaaa",
\ " aaaaaaaaaaaaaa",
\ " aaaaaaaaaaaaaa",
\ ]
*** ../vim-9.0.0649/src/testdir/test_display.vim 2022-09-20 22:01:29.404759229 +0100
--- src/testdir/test_display.vim 2022-10-03 17:01:06.058963922 +0100
***************
*** 143,149 ****

let lines = ScreenLines([1,10], winwidth(0)+1)
let expect = [
! \ "<aaa aaa a|",
\ "a aaa aaa |",
\ "aa aaa aaa|",
\ " aa aaa aa|",
--- 143,149 ----

let lines = ScreenLines([1,10], winwidth(0)+1)
let expect = [
! \ "<<<a aaa a|",
\ "a aaa aaa |",
\ "aa aaa aaa|",
\ " aa aaa aa|",
*** ../vim-9.0.0649/src/testdir/test_listlbr.vim 2021-09-07 19:41:32.000000000 +0100
--- src/testdir/test_listlbr.vim 2022-10-03 17:02:35.534718570 +0100
***************
*** 159,165 ****
exe "norm! $3B\<C-v>eAx\<Esc>"
let lines = s:screen_lines([1, 10], winwidth(0))
let expect = [
! \ "foobar foobar ",
\ "foobar foobar ",
\ "foobar foobar ",
\ "foobar foobar ",
--- 159,165 ----
exe "norm! $3B\<C-v>eAx\<Esc>"
let lines = s:screen_lines([1, 10], winwidth(0))
let expect = [
! \ "<<<bar foobar ",
\ "foobar foobar ",
\ "foobar foobar ",
\ "foobar foobar ",
*** ../vim-9.0.0649/src/testdir/test_listlbr_utf8.vim 2021-09-07 19:41:48.000000000 +0100
--- src/testdir/test_listlbr_utf8.vim 2022-10-03 17:04:27.730412479 +0100
***************
*** 167,173 ****
exe "norm! $3B\<C-v>eAx\<Esc>"
let lines = s:screen_lines([1, 10], winwidth(0))
let expect = [
! \ "+foobar foobar ",
\ "+foobar foobar ",
\ "+foobar foobar ",
\ "+foobar foobar ",
--- 167,173 ----
exe "norm! $3B\<C-v>eAx\<Esc>"
let lines = s:screen_lines([1, 10], winwidth(0))
let expect = [
! \ "<<<obar foobar ",
\ "+foobar foobar ",
\ "+foobar foobar ",
\ "+foobar foobar ",
***************
*** 266,272 ****
norm! $
redraw!
let expect=[
! \ '中aaaaaaaaaaaaaaaaa>',
\ '中aaaaaaaaaaaaaaaaa>',
\ '中aaaaaaaaaaaaaaaaa>',
\ '中aaaaaaaaaaaaaaaaa>',
--- 266,272 ----
norm! $
redraw!
let expect=[
! \ '<<<aaaaaaaaaaaaaaaa>',
\ '中aaaaaaaaaaaaaaaaa>',
\ '中aaaaaaaaaaaaaaaaa>',
\ '中aaaaaaaaaaaaaaaaa>',
*** ../vim-9.0.0649/src/testdir/test_number.vim 2022-09-29 21:37:19.321641591 +0100
--- src/testdir/test_number.vim 2022-10-03 17:05:42.130159598 +0100
***************
*** 138,144 ****
call s:validate_cursor()
let lines = s:screen_lines(1, 3)
let expect = [
! \ "--1 aaaa",
\ " aaaa",
\ " aaaa",
\ ]
--- 138,144 ----
call s:validate_cursor()
let lines = s:screen_lines(1, 3)
let expect = [
! \ "<<< aaaa",
\ " aaaa",
\ " aaaa",
\ ]
*** ../vim-9.0.0649/src/version.c 2022-10-03 16:44:09.401950604 +0100
--- src/version.c 2022-10-03 17:06:28.833885524 +0100
***************
*** 701,702 ****
--- 701,704 ----
{ /* Add new patch number below this line */
+ /**/
+ 650,
/**/

--
hundred-and-one symptoms of being an internet addict:
262. Your computer has it's own phone line - but your daughter doesn't.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///