aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.0217

Browse Source
This commit is contained in:
Bram Moolenaar
2006-03-07 22:38:47 +00:00
parent a203182302
commit 1f35bf9cab
22 changed files with 283 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/quickfix.c
View File

@@ -2905,6 +2905,7 @@ ex_vimgrep(eap)
char_u *au_name = NULL;
int flags = 0;
colnr_T col;
long tomatch;
switch (eap->cmdidx)
{
@@ -2933,6 +2934,11 @@ ex_vimgrep(eap)
return;
}
if (eap->addr_count > 0)
tomatch = eap->line2;
else
tomatch = MAXLNUM;
/* Get the search pattern: either white-separated or enclosed in // */
regmatch.regprog = NULL;
p = skip_vimgrep_pat(eap->arg, &s, &flags);
@@ -2975,7 +2981,7 @@ ex_vimgrep(eap)
}
seconds = (time_t)0;
for (fi = 0; fi < fcount && !got_int; ++fi)
for (fi = 0; fi < fcount && !got_int && tomatch > 0; ++fi)
{
if (time(NULL) > seconds)
{
@@ -3035,7 +3041,8 @@ ex_vimgrep(eap)
{
found_match = FALSE;
/* Try for a match in all lines of the buffer. */
for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
for (lnum = 1; lnum <= buf->b_ml.ml_line_count && tomatch > 0;
++lnum)
{
/* For ":1vimgrep" look for multiple matches. */
col = 0;
@@ -3059,8 +3066,9 @@ ex_vimgrep(eap)
got_int = TRUE;
break;
}
else
found_match = TRUE;
found_match = TRUE;
if (--tomatch == 0)
break;
if ((flags & VGR_GLOBAL) == 0
|| regmatch.endpos[0].lnum > 0)
break;