mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
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.
d4566c14e7
Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
parent
d9235efa76
commit
a941207523
@ -196,7 +196,7 @@ static void redraw_for_cursorcolumn(win_T *wp)
|
|||||||
int sms_marker_overlap(win_T *wp, int extra2)
|
int sms_marker_overlap(win_T *wp, int extra2)
|
||||||
{
|
{
|
||||||
// There is no marker overlap when in showbreak mode, thus no need to
|
// 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) {
|
if (*get_showbreak_value(wp) != NUL) {
|
||||||
return 0;
|
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!
|
// w_topline must be valid, you may need to call update_topline() first!
|
||||||
void validate_cursor(win_T *wp)
|
void validate_cursor(win_T *wp)
|
||||||
{
|
{
|
||||||
check_cursor(wp);
|
check_cursor_lnum(wp);
|
||||||
check_cursor_moved(wp);
|
check_cursor_moved(wp);
|
||||||
if ((wp->w_valid & (VALID_WCOL|VALID_WROW)) != (VALID_WCOL|VALID_WROW)) {
|
if ((wp->w_valid & (VALID_WCOL|VALID_WROW)) != (VALID_WCOL|VALID_WROW)) {
|
||||||
curs_columns(wp, true);
|
curs_columns(wp, true);
|
||||||
|
@ -365,7 +365,7 @@ local function test_cmdline(linegrid)
|
|||||||
grid = [[
|
grid = [[
|
||||||
|
|
|
|
||||||
{2:[No Name] }|
|
{2:[No Name] }|
|
||||||
{1::}mak^e |
|
{1::}make^ |
|
||||||
{3:[Command Line] }|
|
{3:[Command Line] }|
|
||||||
|
|
|
|
||||||
]],
|
]],
|
||||||
@ -377,7 +377,7 @@ local function test_cmdline(linegrid)
|
|||||||
grid = [[
|
grid = [[
|
||||||
|
|
|
|
||||||
{2:[No Name] }|
|
{2:[No Name] }|
|
||||||
{1::}mak^e |
|
{1::}make^ |
|
||||||
{3:[Command Line] }|
|
{3:[Command Line] }|
|
||||||
|
|
|
|
||||||
]],
|
]],
|
||||||
@ -396,7 +396,7 @@ local function test_cmdline(linegrid)
|
|||||||
grid = [[
|
grid = [[
|
||||||
|
|
|
|
||||||
{2:[No Name] }|
|
{2:[No Name] }|
|
||||||
{1::}mak^e |
|
{1::}make^ |
|
||||||
{3:[Command Line] }|
|
{3:[Command Line] }|
|
||||||
|
|
|
|
||||||
]],
|
]],
|
||||||
@ -416,7 +416,7 @@ local function test_cmdline(linegrid)
|
|||||||
grid = [[
|
grid = [[
|
||||||
|
|
|
|
||||||
{2:[No Name] }|
|
{2:[No Name] }|
|
||||||
{1::}mak^e |
|
{1::}make^ |
|
||||||
{3:[Command Line] }|
|
{3:[Command Line] }|
|
||||||
|
|
|
|
||||||
]],
|
]],
|
||||||
@ -1586,7 +1586,7 @@ describe('cmdheight=0', function()
|
|||||||
topline = 0,
|
topline = 0,
|
||||||
botline = 2,
|
botline = 2,
|
||||||
curline = 0,
|
curline = 0,
|
||||||
curcol = 0,
|
curcol = 1,
|
||||||
linecount = 1,
|
linecount = 1,
|
||||||
sum_scroll_delta = 0,
|
sum_scroll_delta = 0,
|
||||||
},
|
},
|
||||||
|
@ -2942,7 +2942,7 @@ describe('builtin popupmenu', function()
|
|||||||
|
|
|
|
||||||
{3:[No Name] }|
|
{3:[No Name] }|
|
||||||
{1::}sign define |
|
{1::}sign define |
|
||||||
{1::}sign defin^e |
|
{1::}sign define^ |
|
||||||
{1:~ }|*4
|
{1:~ }|*4
|
||||||
{4:[Command Line] }|
|
{4:[Command Line] }|
|
||||||
:sign define |
|
:sign define |
|
||||||
|
@ -53,7 +53,7 @@ describe('search highlighting', function()
|
|||||||
topline = 0,
|
topline = 0,
|
||||||
botline = 3,
|
botline = 3,
|
||||||
curline = 0,
|
curline = 0,
|
||||||
curcol = 8,
|
curcol = 9,
|
||||||
linecount = 2,
|
linecount = 2,
|
||||||
sum_scroll_delta = 0,
|
sum_scroll_delta = 0,
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user