From c93fd83df206c2438a735d6d99e640db1976f2f0 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 9 Oct 2022 18:48:32 +0800
Subject: vim-patch:9.0.0697: cursor in wrong position with Visual substitute

Problem:    Cursor in wrong position with Visual substitute.
Solution:   When restoring 'linebreak' mark the virtual column as invalid.
            (closes vim/vim#11309, closes vim/vim#11311)
https://github.com/vim/vim/commit/16dab41537ae206f4cab676ad53edbae5fd5fb45

N/A patches for version.c:

vim-patch:9.0.0699: tiny build fails

Problem:    Tiny build fails.
Solution:   Add #ifdef.
https://github.com/vim/vim/commit/bf499c0e6f30a94fe062f83ea0190f93178d0d74
---
 src/nvim/testdir/test_listlbr.vim | 21 +++++++++++++++++++++
 src/nvim/testdir/test_visual.vim  | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_listlbr.vim b/src/nvim/testdir/test_listlbr.vim
index affa0f96fa..8598c0d963 100644
--- a/src/nvim/testdir/test_listlbr.vim
+++ b/src/nvim/testdir/test_listlbr.vim
@@ -7,6 +7,7 @@ CheckOption linebreak
 CheckFeature conceal
 
 source view_util.vim
+source screendump.vim
 
 function s:screen_lines(lnum, width) abort
   return ScreenLines(a:lnum, a:width)
@@ -133,6 +134,26 @@ func Test_linebreak_with_visual_operations()
   call s:close_windows()
 endfunc
 
+func Test_linebreak_reset_restore()
+  CheckScreendump
+
+  let lines =<< trim END
+      vim9script
+      &linebreak = true
+      &showcmd = true
+      &showmode = false
+      ('a'->repeat(&columns - 10) .. ' ' .. 'b'->repeat(10) .. ' c')->setline(1)
+  END
+  call writefile(lines, 'XlbrResetRestore', 'D')
+  let buf = RunVimInTerminal('-S XlbrResetRestore', {'rows': 8})
+
+  call term_sendkeys(buf, '$v$s')
+  call VerifyScreenDump(buf, 'Test_linebreak_reset_restore_1', {})
+
+  call term_sendkeys(buf, "\<Esc>")
+  call StopVimInTerminal(buf)
+endfunc
+
 func Test_virtual_block()
   call s:test_windows('setl sbr=+')
   call setline(1, [
diff --git a/src/nvim/testdir/test_visual.vim b/src/nvim/testdir/test_visual.vim
index 9c1ad0c099..faa6b2c1c3 100644
--- a/src/nvim/testdir/test_visual.vim
+++ b/src/nvim/testdir/test_visual.vim
@@ -1492,5 +1492,37 @@ func Test_switch_buffer_ends_visual_mode()
   exe 'bwipe!' buf2
 endfunc
 
+" Test that cursor is drawn at correct position after an operator in Visual
+" mode when 'linebreak' and 'showcmd' are enabled.
+func Test_visual_operator_with_linebreak()
+  CheckRunVimInTerminal
+
+  let lines =<< trim END
+    set linebreak showcmd noshowmode
+    call setline(1, repeat('a', &columns - 10) .. ' bbbbbbbbbb c')
+  END
+  call writefile(lines, 'XTest_visual_op_linebreak', 'D')
+
+  let buf = RunVimInTerminal('-S XTest_visual_op_linebreak', {'rows': 6})
+
+  call term_sendkeys(buf, '$v$')
+  call WaitForAssert({-> assert_equal(13, term_getcursor(buf)[1])})
+  call term_sendkeys(buf, 'zo')
+  call WaitForAssert({-> assert_equal(12, term_getcursor(buf)[1])})
+
+  call term_sendkeys(buf, "$\<C-V>$")
+  call WaitForAssert({-> assert_equal(13, term_getcursor(buf)[1])})
+  call term_sendkeys(buf, 'I')
+  call WaitForAssert({-> assert_equal(12, term_getcursor(buf)[1])})
+
+  call term_sendkeys(buf, "\<Esc>$v$")
+  call WaitForAssert({-> assert_equal(13, term_getcursor(buf)[1])})
+  call term_sendkeys(buf, 's')
+  call WaitForAssert({-> assert_equal(12, term_getcursor(buf)[1])})
+
+  " clean up
+  call term_sendkeys(buf, "\<Esc>")
+  call StopVimInTerminal(buf)
+endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab
-- 
cgit 


From 7cdaa74b3684d40a6e72bbf3eb4deedb0c5df7bc Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 9 Oct 2022 18:57:22 +0800
Subject: vim-patch:9.0.0702: incomplete testing cursor position with
 'linebreak' set

Problem:    Incomplete testing cursor position after change with 'linebreak'
            set.
Solution:   Add a test and move test cases together. (closes vim/vim#11313)
https://github.com/vim/vim/commit/30c0c467d6cc2a7af960ccb9002b50115b0e55cf
---
 src/nvim/testdir/test_listlbr.vim | 31 +++++++++++++++++++++++++------
 src/nvim/testdir/test_visual.vim  | 33 ---------------------------------
 2 files changed, 25 insertions(+), 39 deletions(-)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_listlbr.vim b/src/nvim/testdir/test_listlbr.vim
index 8598c0d963..1cbdba5d76 100644
--- a/src/nvim/testdir/test_listlbr.vim
+++ b/src/nvim/testdir/test_listlbr.vim
@@ -134,22 +134,41 @@ func Test_linebreak_with_visual_operations()
   call s:close_windows()
 endfunc
 
+" Test that cursor is drawn at correct position after an operator when
+" 'linebreak' is enabled.
 func Test_linebreak_reset_restore()
   CheckScreendump
 
+  " f_wincol() calls validate_cursor()
   let lines =<< trim END
-      vim9script
-      &linebreak = true
-      &showcmd = true
-      &showmode = false
-      ('a'->repeat(&columns - 10) .. ' ' .. 'b'->repeat(10) .. ' c')->setline(1)
+    set linebreak showcmd noshowmode formatexpr=wincol()-wincol()
+    call setline(1, repeat('a', &columns - 10) .. ' bbbbbbbbbb c')
   END
   call writefile(lines, 'XlbrResetRestore', 'D')
   let buf = RunVimInTerminal('-S XlbrResetRestore', {'rows': 8})
 
-  call term_sendkeys(buf, '$v$s')
+  call term_sendkeys(buf, '$v$')
+  call WaitForAssert({-> assert_equal(13, term_getcursor(buf)[1])})
+  call term_sendkeys(buf, 'zo')
+  call WaitForAssert({-> assert_equal(12, term_getcursor(buf)[1])})
+
+  call term_sendkeys(buf, '$v$')
+  call WaitForAssert({-> assert_equal(13, term_getcursor(buf)[1])})
+  call term_sendkeys(buf, 'gq')
+  call WaitForAssert({-> assert_equal(12, term_getcursor(buf)[1])})
+
+  call term_sendkeys(buf, "$\<C-V>$")
+  call WaitForAssert({-> assert_equal(13, term_getcursor(buf)[1])})
+  call term_sendkeys(buf, 'I')
+  call WaitForAssert({-> assert_equal(12, term_getcursor(buf)[1])})
+
+  call term_sendkeys(buf, "\<Esc>$v$")
+  call WaitForAssert({-> assert_equal(13, term_getcursor(buf)[1])})
+  call term_sendkeys(buf, 's')
+  call WaitForAssert({-> assert_equal(12, term_getcursor(buf)[1])})
   call VerifyScreenDump(buf, 'Test_linebreak_reset_restore_1', {})
 
+  " clean up
   call term_sendkeys(buf, "\<Esc>")
   call StopVimInTerminal(buf)
 endfunc
diff --git a/src/nvim/testdir/test_visual.vim b/src/nvim/testdir/test_visual.vim
index faa6b2c1c3..65665d36c0 100644
--- a/src/nvim/testdir/test_visual.vim
+++ b/src/nvim/testdir/test_visual.vim
@@ -1492,37 +1492,4 @@ func Test_switch_buffer_ends_visual_mode()
   exe 'bwipe!' buf2
 endfunc
 
-" Test that cursor is drawn at correct position after an operator in Visual
-" mode when 'linebreak' and 'showcmd' are enabled.
-func Test_visual_operator_with_linebreak()
-  CheckRunVimInTerminal
-
-  let lines =<< trim END
-    set linebreak showcmd noshowmode
-    call setline(1, repeat('a', &columns - 10) .. ' bbbbbbbbbb c')
-  END
-  call writefile(lines, 'XTest_visual_op_linebreak', 'D')
-
-  let buf = RunVimInTerminal('-S XTest_visual_op_linebreak', {'rows': 6})
-
-  call term_sendkeys(buf, '$v$')
-  call WaitForAssert({-> assert_equal(13, term_getcursor(buf)[1])})
-  call term_sendkeys(buf, 'zo')
-  call WaitForAssert({-> assert_equal(12, term_getcursor(buf)[1])})
-
-  call term_sendkeys(buf, "$\<C-V>$")
-  call WaitForAssert({-> assert_equal(13, term_getcursor(buf)[1])})
-  call term_sendkeys(buf, 'I')
-  call WaitForAssert({-> assert_equal(12, term_getcursor(buf)[1])})
-
-  call term_sendkeys(buf, "\<Esc>$v$")
-  call WaitForAssert({-> assert_equal(13, term_getcursor(buf)[1])})
-  call term_sendkeys(buf, 's')
-  call WaitForAssert({-> assert_equal(12, term_getcursor(buf)[1])})
-
-  " clean up
-  call term_sendkeys(buf, "\<Esc>")
-  call StopVimInTerminal(buf)
-endfunc
-
 " vim: shiftwidth=2 sts=2 expandtab
-- 
cgit