Mirror of the Vim source from https://github.com/vim/vim
Revision | dfcff6590aba6d93a69b414759b164c255fda08f (tree) |
---|---|
Time | 2008-01-22 19:59:38 |
Author | vimboss |
Commiter | vimboss |
updated for version 7.1-238
@@ -14189,6 +14189,10 @@ | ||
14189 | 14189 | goto theend; |
14190 | 14190 | } |
14191 | 14191 | |
14192 | + /* Using 'r' implies 'W', otherwise it doesn't work. */ | |
14193 | + if (flags & SP_REPEAT) | |
14194 | + p_ws = FALSE; | |
14195 | + | |
14192 | 14196 | /* Optional fifth argument: skip expression */ |
14193 | 14197 | if (argvars[3].v_type == VAR_UNKNOWN |
14194 | 14198 | || argvars[4].v_type == VAR_UNKNOWN) |
@@ -14345,6 +14349,9 @@ | ||
14345 | 14349 | } |
14346 | 14350 | foundpos = pos; |
14347 | 14351 | |
14352 | + /* clear the start flag to avoid getting stuck here */ | |
14353 | + options &= ~SEARCH_START; | |
14354 | + | |
14348 | 14355 | /* If the skip pattern matches, ignore this match. */ |
14349 | 14356 | if (*skip != NUL) |
14350 | 14357 | { |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 238, | |
671 | +/**/ | |
670 | 672 | 237, |
671 | 673 | /**/ |
672 | 674 | 236, |