# HG changeset patch # User Bram Moolenaar # Date 1674418503 -3600 # Node ID ddbc560ecc41b458d417c497737166c889707a8d # Parent c476ed5d66ef83dde0baa21895dea756e80d377e patch 9.0.1233: search() loops forever if "skip" is TRUE for all matches Commit: https://github.com/vim/vim/commit/3d79f0a4309995956bd8889940cca22f7a15881d Author: Bram Moolenaar Date: Sun Jan 22 20:14:26 2023 +0000 patch 9.0.1233: search() loops forever if "skip" is TRUE for all matches Problem: search() loops forever if "skip" is TRUE for all matches. Solution: Keep the position of the first match. diff --git a/src/evalfunc.c b/src/evalfunc.c --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -8794,7 +8794,8 @@ search_cmn(typval_T *argvars, pos_T *mat if (subpatnum == FAIL || !use_skip) // didn't find it or no skip argument break; - firstpos = pos; + if (firstpos.lnum == 0) + firstpos = pos; // If the skip expression matches, ignore this match. { diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim --- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -1411,6 +1411,22 @@ func Test_subst_word_under_cursor() set noincsearch endfunc +func Test_search_skip_all_matches() + enew + call setline(1, ['no match here', + \ 'match this line', + \ 'nope', + \ 'match in this line', + \ 'last line', + \ ]) + call cursor(1, 1) + let lnum = search('this', '', 0, 0, 'getline(".") =~ "this line"') + " Only check that no match is found. Previously it searched forever. + call assert_equal(0, lnum) + + bwipe! +endfunc + func Test_search_undefined_behaviour() CheckFeature terminal diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1233, +/**/ 1232, /**/ 1231,