neovim

commit a94120752344f04c3f6d7e088026e9a58f46fe64
parent d9235efa76229708586d3c9db3dcbac46127ca0a
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Tue,  2 Apr 2024 19:08:03 +0800

vim-patch:9.0.0581: adding a character for incsearch fails at end of line

Problem:    Adding a character for incsearch fails at end of line.
Solution:   Only check cursor line number.

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

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

Diffstat:
M
src/nvim/move.c
 | 
4
++--
M
test/functional/ui/cmdline_spec.lua
 | 
10
+++++-----
M
test/functional/ui/popupmenu_spec.lua
 | 
2
+-
M
test/functional/ui/searchhl_spec.lua
 | 
2
+-

4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/nvim/move.c b/src/nvim/move.c
@@ -196,7 +196,7 @@ static void redraw_for_cursorcolumn(win_T *wp)
 int sms_marker_overlap(win_T *wp, int extra2)
 {
   // There is no marker overlap when in showbreak mode, thus no need to
-  // account for it.  See grid_put_linebuf().
+  // account for it.  See wlv_put_linebuf().
   if (*get_showbreak_value(wp) != NUL) {
     return 0;
   }
@@ -621,7 +621,7 @@ int cursor_valid(win_T *wp)
 // w_topline must be valid, you may need to call update_topline() first!
 void validate_cursor(win_T *wp)
 {
-  check_cursor(wp);
+  check_cursor_lnum(wp);
   check_cursor_moved(wp);
   if ((wp->w_valid & (VALID_WCOL|VALID_WROW)) != (VALID_WCOL|VALID_WROW)) {
     curs_columns(wp, true);
diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua
@@ -365,7 +365,7 @@ local function test_cmdline(linegrid)
       grid = [[
                                |
       {2:[No Name]                }|
-      {1::}mak^e                    |
+      {1::}make^                    |
       {3:[Command Line]           }|
                                |
     ]],
@@ -377,7 +377,7 @@ local function test_cmdline(linegrid)
       grid = [[
                                |
       {2:[No Name]                }|
-      {1::}mak^e                    |
+      {1::}make^                    |
       {3:[Command Line]           }|
                                |
     ]],
@@ -396,7 +396,7 @@ local function test_cmdline(linegrid)
       grid = [[
                                |
       {2:[No Name]                }|
-      {1::}mak^e                    |
+      {1::}make^                    |
       {3:[Command Line]           }|
                                |
     ]],
@@ -416,7 +416,7 @@ local function test_cmdline(linegrid)
       grid = [[
                                |
       {2:[No Name]                }|
-      {1::}mak^e                    |
+      {1::}make^                    |
       {3:[Command Line]           }|
                                |
     ]],
@@ -1586,7 +1586,7 @@ describe('cmdheight=0', function()
           topline = 0,
           botline = 2,
           curline = 0,
-          curcol = 0,
+          curcol = 1,
           linecount = 1,
           sum_scroll_delta = 0,
         },
diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua
@@ -2942,7 +2942,7 @@ describe('builtin popupmenu', function()
                                           |
           {3:[No Name]                       }|
           {1::}sign define                    |
-          {1::}sign defin^e                    |
+          {1::}sign define^                    |
           {1:~                               }|*4
           {4:[Command Line]                  }|
           :sign define                    |
diff --git a/test/functional/ui/searchhl_spec.lua b/test/functional/ui/searchhl_spec.lua
@@ -53,7 +53,7 @@ describe('search highlighting', function()
           topline = 0,
           botline = 3,
           curline = 0,
-          curcol = 8,
+          curcol = 9,
           linecount = 2,
           sum_scroll_delta = 0,
         },