vim-patch:9.0.0664: bad redrawing with spell checking, using "C" and "$" in 'cpo'

Problem:    Bad redrawing with spell checking, using "C" and "$" in 'cpo'.
Solution:   Do not redraw the next line when "$" is in 'cpo'. (closes vim/vim#11285)

https://github.com/vim/vim/commit/f3ef026c9897f1d2e3fba47166a4771d507dae91

Co-authored-by: Bram Moolenaar <Bram@vim.org>

1 files changed, 26 insertions, 19 deletions

diff --git a/test/old/testdir/test_spell.vim b/test/old/testdir/test_spell.vim
index c959e199d9..14d6ce30c4 100644
--- a/test/old/testdir/test_spell.vim
+++ b/test/old/testdir/test_spell.vim
@@ -972,28 +972,12 @@ func Test_spell_screendump()
              \ ])
        set spell spelllang=en_nz
   END
-  call writefile(lines, 'XtestSpell')
-  let buf = RunVimInTerminal('-S XtestSpell', {'rows': 8})
-  call VerifyScreenDump(buf, 'Test_spell_1', {})
-
-  let lines =<< trim END
-       call setline(1, [
-             \ "This is some text without any spell errors.  Everything",
-             \ "should just be black, nothing wrong here.",
-             \ "",
-             \ "This line has a sepll error. and missing caps.",
-             \ "And and this is the the duplication.",
-             \ "with missing caps here.",
-             \ ])
-       set spell spelllang=en_nz
-  END
-  call writefile(lines, 'XtestSpell')
+  call writefile(lines, 'XtestSpell', 'D')
   let buf = RunVimInTerminal('-S XtestSpell', {'rows': 8})
   call VerifyScreenDump(buf, 'Test_spell_1', {})
 
   " clean up
   call StopVimInTerminal(buf)
-  call delete('XtestSpell')
 endfunc
 
 func Test_spell_screendump_spellcap()
@@ -1010,7 +994,7 @@ func Test_spell_screendump_spellcap()
              \ ])
        set spell spelllang=en
   END
-  call writefile(lines, 'XtestSpellCap')
+  call writefile(lines, 'XtestSpellCap', 'D')
   let buf = RunVimInTerminal('-S XtestSpellCap', {'rows': 8})
   call VerifyScreenDump(buf, 'Test_spell_2', {})
 
@@ -1028,7 +1012,30 @@ func Test_spell_screendump_spellcap()
 
   " clean up
   call StopVimInTerminal(buf)
-  call delete('XtestSpellCap')
+endfunc
+
+func Test_spell_compatible()
+  CheckScreendump
+
+  let lines =<< trim END
+       call setline(1, [
+             \ "test "->repeat(20),
+             \ "",
+             \ "end",
+             \ ])
+       set spell cpo+=$
+  END
+  call writefile(lines, 'XtestSpellComp', 'D')
+  let buf = RunVimInTerminal('-S XtestSpellComp', {'rows': 8})
+
+  call term_sendkeys(buf, "51|C")
+  call VerifyScreenDump(buf, 'Test_spell_compatible_1', {})
+
+  call term_sendkeys(buf, "x")
+  call VerifyScreenDump(buf, 'Test_spell_compatible_2', {})
+
+  " clean up
+  call StopVimInTerminal(buf)
 endfunc
 
 let g:test_data_aff1 = [