Mercurial > vim
changeset 32447:f5946a50c931 v9.0.1555
patch 9.0.1555: setcharsearch() does not clear last searched char properly
Commit: https://github.com/vim/vim/commit/e5d91ba1de83949eb9357c0fb8cbd91e7e69be6f
Author: zeertzjq <zeertzjq@outlook.com>
Date: Sun May 14 17:39:18 2023 +0100
patch 9.0.1555: setcharsearch() does not clear last searched char properly
Problem: setcharsearch() does not clear last searched char properly.
Solution: Do not accept lastc_bytelen smaller than one. (closes https://github.com/vim/vim/issues/12398)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 14 May 2023 18:45:03 +0200 |
| parents | fa69eb358c4e |
| children | 62943590c35e |
| files | src/search.c src/testdir/test_charsearch.vim src/testdir/test_charsearch_utf8.vim src/version.c |
| diffstat | 4 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/search.c +++ b/src/search.c @@ -496,7 +496,7 @@ last_csearch_until(void) } void -set_last_csearch(int c, char_u *s UNUSED, int len UNUSED) +set_last_csearch(int c, char_u *s, int len) { *lastc = c; lastc_bytelen = len; @@ -1789,7 +1789,7 @@ 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 dir = -lastcdir; @@ -1833,7 +1833,7 @@ searchc(cmdarg_T *cap, int t_cmd) return FAIL; col -= (*mb_head_off)(p, p + col - 1) + 1; } - if (lastc_bytelen == 1) + if (lastc_bytelen <= 1) { if (p[col] == c && stop) break;
--- a/src/testdir/test_charsearch.vim +++ b/src/testdir/test_charsearch.vim @@ -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([])", 'E1206:') enew!
--- a/src/testdir/test_charsearch_utf8.vim +++ b/src/testdir/test_charsearch_utf8.vim @@ -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