Mercurial > vim
diff src/search.c @ 1877:b5c1cb6f8d56 v7.2.174
updated for version 7.2-174
author | vimboss |
---|---|
date | Fri, 15 May 2009 19:33:18 +0000 |
parents | 44c01fae1181 |
children | c8f343a465a2 |
line wrap: on
line diff
--- a/src/search.c +++ b/src/search.c @@ -522,7 +522,6 @@ last_pat_prog(regmatch) * When FEAT_EVAL is defined, returns the index of the first matching * subpattern plus one; one if there was none. */ -/*ARGSUSED*/ int searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm) win_T *win; /* window to search in; can be NULL for a @@ -535,7 +534,7 @@ searchit(win, buf, pos, dir, pat, count, int options; int pat_use; /* which pattern to use when "pat" is empty */ linenr_T stop_lnum; /* stop after this line number when != 0 */ - proftime_T *tm; /* timeout limit or NULL */ + proftime_T *tm UNUSED; /* timeout limit or NULL */ { int found; linenr_T lnum; /* no init to shut up Apollo cc */ @@ -554,8 +553,6 @@ searchit(win, buf, pos, dir, pat, count, int save_called_emsg = called_emsg; #ifdef FEAT_SEARCH_EXTRA int break_loop = FALSE; -#else -# define break_loop FALSE #endif if (search_regcomp(pat, RE_SEARCH, pat_use, @@ -940,7 +937,10 @@ searchit(win, buf, pos, dir, pat, count, * twice. */ if (!p_ws || stop_lnum != 0 || got_int || called_emsg - || break_loop || found || loop) +#ifdef FEAT_SEARCH_EXTRA + || break_loop +#endif + || found || loop) break; /* @@ -958,7 +958,11 @@ searchit(win, buf, pos, dir, pat, count, give_warning((char_u *)_(dir == BACKWARD ? top_bot_msg : bot_top_msg), TRUE); } - if (got_int || called_emsg || break_loop) + if (got_int || called_emsg +#ifdef FEAT_SEARCH_EXTRA + || break_loop +#endif + ) break; } while (--count > 0 && found); /* stop after count matches or no match */