thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.1.1148: CTRL-L with 'incsearch' does not pick up char under cursor

Browse Source 
Problem:    CTRL-L with 'incsearch' does not pick up char under cursor.
            (Smylers)
Solution:   Do not compare the position with the cursor position. (Hirohito
            Higashi, closes #3620)
This commit is contained in:
Bram Moolenaar 2019-04-11 13:45:57 +02:00
parent a60e536a29
commit 730f48fe36
3 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/ex_getln.c
View File

@ -745,39 +745,35 @@ may_add_char_to_search(int firstc, int *c, incsearch_state_T *is_state)
if (is_state->did_incsearch)
{
curwin->w_cursor = is_state->match_end;
if (!EQUAL_POS(curwin->w_cursor, is_state->search_start))
*c = gchar_cursor();
if (*c != NUL)
{
*c = gchar_cursor();
// If 'ignorecase' and 'smartcase' are set and the
// command line has no uppercase characters, convert
// the character to lowercase.
if (p_ic && p_scs && !pat_has_uppercase(ccline.cmdbuff + skiplen))
*c = MB_TOLOWER(*c);
if (*c != NUL)
if (*c == firstc || vim_strchr((char_u *)(
p_magic ? "\\~^$.*[" : "\\^$"), *c) != NULL)
{
if (*c == firstc || vim_strchr((char_u *)(
p_magic ? "\\~^$.*[" : "\\^$"), *c) != NULL)
{
// put a backslash before special characters
stuffcharReadbuff(*c);
*c = '\\';
}
// add any composing characters
if (mb_char2len(*c) != mb_ptr2len(ml_get_cursor()))
{
int save_c = *c;
while (mb_char2len(*c) != mb_ptr2len(ml_get_cursor()))
{
curwin->w_cursor.col += mb_char2len(*c);
*c = gchar_cursor();
stuffcharReadbuff(*c);
}
*c = save_c;
}
return FAIL;
// put a backslash before special characters
stuffcharReadbuff(*c);
*c = '\\';
}
// add any composing characters
if (mb_char2len(*c) != mb_ptr2len(ml_get_cursor()))
{
int save_c = *c;
while (mb_char2len(*c) != mb_ptr2len(ml_get_cursor()))
{
curwin->w_cursor.col += mb_char2len(*c);
*c = gchar_cursor();
stuffcharReadbuff(*c);
}
*c = save_c;
}
return FAIL;
}
}
return OK;

17
src/testdir/test_search.vim
View File

@ -1248,3 +1248,20 @@ func Test_one_error_msg()
" This was also giving an internal error
call assert_fails('call search(" \\((\\v[[=P=]]){185}+ ")', 'E871:')
endfunc
func Test_incsearch_add_char_under_cursor()
if !exists('+incsearch')
return
endif
set incsearch
new
call setline(1, ['find match', 'anything'])
1
call test_override('char_avail', 1)
call feedkeys("fc/m\<C-L>\<C-L>\<C-L>\<C-L>\<C-L>\<CR>", 'tx')
call assert_equal('match', @/)
call test_override('char_avail', 0)
set incsearch&
bwipe!
endfunc

2
src/version.c
View File

@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1148,
/**/
1147,
/**/