From e9b1df21bc9c051fe46578772c45c5bdadaf1e5c Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Thu, 27 Apr 2023 04:52:52 +0200
Subject: vim-patch:9.0.0650: some tests are failing

Problem:    Some tests are failing.
Solution:   Adjust for "<<<" showing up.

https://github.com/vim/vim/commit/0466d398a550623126fba3a2a08208a798b28bda

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 test/old/testdir/test_breakindent.vim  | 20 ++++++++++----------
 test/old/testdir/test_display.vim      |  2 +-
 test/old/testdir/test_listlbr.vim      |  2 +-
 test/old/testdir/test_listlbr_utf8.vim |  4 ++--
 test/old/testdir/test_number.vim       |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/old/testdir/test_breakindent.vim b/test/old/testdir/test_breakindent.vim
index 0d1753182e..f271e6f2ea 100644
--- a/test/old/testdir/test_breakindent.vim
+++ b/test/old/testdir/test_breakindent.vim
@@ -87,7 +87,7 @@ func Test_breakindent02_vartabs()
   endif
   " 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",
@@ -100,7 +100,7 @@ endfunc
 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",
@@ -117,7 +117,7 @@ func Test_breakindent03_vartabs()
     return
   endif
   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",
@@ -132,7 +132,7 @@ func Test_breakindent04()
   " 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",
@@ -150,7 +150,7 @@ func Test_breakindent04_vartabs()
     return
   endif
   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",
@@ -583,7 +583,7 @@ func Test_breakindent16()
   redraw!
   let lines = s:screen_lines(1,10)
   let expect = [
-	\ "    789012",
+	\ "<<< 789012",
 	\ "    345678",
 	\ "    901234",
 	\ ]
@@ -611,7 +611,7 @@ func Test_breakindent16_vartabs()
   redraw!
   let lines = s:screen_lines(1,10)
   let expect = [
-	\ "    789012",
+	\ "<<< 789012",
 	\ "    345678",
 	\ "    901234",
 	\ ]
@@ -700,7 +700,7 @@ func Test_breakindent19_sbr_nextpage()
   norm! 5gj
   let lines = s:screen_lines(1, 20)
   let expect = [
-	\ ">aaaaaaaaaaaaaaaaaaa",
+	\ "<<<aaaaaaaaaaaaaaaaa",
 	\ ">aaaaaaaaaaaaaaaaaaa",
 	\ ">aaaaaaaaaaaaaaaaaaa",
 	\ ]
@@ -727,7 +727,7 @@ func Test_breakindent20_cpo_n_nextpage()
   redraw!
   let lines = s:screen_lines(1, 20)
   let expect = [
-	\ "--1 aaaaaaaaaaaaaaaa",
+	\ "<<< aaaaaaaaaaaaaaaa",
 	\ "    aaaaaaaaaaaaaaaa",
 	\ "    aaaaaaaaaaaaaaaa",
 	\ ]
@@ -746,7 +746,7 @@ func Test_breakindent20_cpo_n_nextpage()
   norm! 5gj
   let lines = s:screen_lines(1, 20)
   let expect = [
-	\ "--1   aaaaaaaaaaaaaa",
+	\ "<<<   aaaaaaaaaaaaaa",
 	\ "      aaaaaaaaaaaaaa",
 	\ "      aaaaaaaaaaaaaa",
 	\ ]
diff --git a/test/old/testdir/test_display.vim b/test/old/testdir/test_display.vim
index b642f39c9f..aae1030aac 100644
--- a/test/old/testdir/test_display.vim
+++ b/test/old/testdir/test_display.vim
@@ -146,7 +146,7 @@ func Test_display_listchars_precedes()
 
   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/test/old/testdir/test_listlbr.vim b/test/old/testdir/test_listlbr.vim
index a746779e73..2e66fd4ccb 100644
--- a/test/old/testdir/test_listlbr.vim
+++ b/test/old/testdir/test_listlbr.vim
@@ -223,7 +223,7 @@ func Test_virtual_block_and_vbA()
   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/test/old/testdir/test_listlbr_utf8.vim b/test/old/testdir/test_listlbr_utf8.vim
index df1ed78119..47683696d1 100644
--- a/test/old/testdir/test_listlbr_utf8.vim
+++ b/test/old/testdir/test_listlbr_utf8.vim
@@ -167,7 +167,7 @@ func Test_visual_block_and_selection_exclusive()
   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 @@ func Test_chinese_char_on_wrap_column()
   norm! $
   redraw!
   let expect=[
-\ '中aaaaaaaaaaaaaaaaa>',
+\ '<<<aaaaaaaaaaaaaaaa>',
 \ '中aaaaaaaaaaaaaaaaa>',
 \ '中aaaaaaaaaaaaaaaaa>',
 \ '中aaaaaaaaaaaaaaaaa>',
diff --git a/test/old/testdir/test_number.vim b/test/old/testdir/test_number.vim
index 521b0cf706..cf777fd918 100644
--- a/test/old/testdir/test_number.vim
+++ b/test/old/testdir/test_number.vim
@@ -138,7 +138,7 @@ func Test_number_with_linewrap1()
   call s:validate_cursor()
   let lines = s:screen_lines(1, 3)
   let expect = [
-\ "--1 aaaa",
+\ "<<< aaaa",
 \ "    aaaa",
 \ "    aaaa",
 \ ]
-- 
cgit