mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-05 19:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1555: setcharsearch() does not clear last searched char properly

Browse Source 
Problem:    setcharsearch() does not clear last searched char properly.
Solution:   Do not accept lastc_bytelen smaller than one. (closes vim/vim#12398)

e5d91ba1de
(cherry picked from commit 8a751ca360)
This commit is contained in:
zeertzjq
2023-05-15 07:36:48 +08:00
committed by github-actions[bot]
parent 6f7e5ce006
commit f3c7182482
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/search.c
View File

@@ -1513,7 +1513,7 @@ int searchc(cmdarg_T *cap, int t_cmd)
}
}
} else { // repeat previous search
if (*lastc == NUL && lastc_bytelen == 1) {
if (*lastc == NUL && lastc_bytelen <= 1) {
return FAIL;
}
if (dir) { // repeat in opposite direction
@@ -1556,7 +1556,7 @@ int searchc(cmdarg_T *cap, int t_cmd)
}
col -= utf_head_off(p, p + col - 1) + 1;
}
if (lastc_bytelen == 1) {
if (lastc_bytelen <= 1) {
if (p[col] == c && stop) {
break;
}

2
test/old/testdir/test_charsearch.vim
View File

@@ -38,6 +38,8 @@ func Test_charsearch()
" clear the character search
call setcharsearch({'char' : ''})
call assert_equal('', getcharsearch().char)
call assert_beeps('normal ;')
call assert_beeps('normal ,')
call assert_fails("call setcharsearch([])", 'E715:')
enew!

7
test/old/testdir/test_charsearch_utf8.vim
View File

@@ -13,6 +13,13 @@ func Test_search_cmds()
call assert_equal([0, 1, 43, 0], getpos('.'))
normal! ,
call assert_equal([0, 1, 28, 0], getpos('.'))
call assert_equal('最', getcharsearch().char)
call setcharsearch({'char' : ''})
call assert_equal('', getcharsearch().char)
call assert_beeps('normal ;')
call assert_equal([0, 1, 28, 0], getpos('.'))
call assert_beeps('normal ,')
call assert_equal([0, 1, 28, 0], getpos('.'))
bw!
endfunc