aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.1-111

Browse Source
This commit is contained in:
Bram Moolenaar 2007-09-16 11:27:42 +00:00
parent 3b9b13e564
commit 1042fa3857
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/quickfix.c
View File

@ -1612,8 +1612,8 @@ qf_jump(qi, dir, errornr, forceit)
} }
/* /*
* If there is only one window and is the quickfix window, create a new * If there is only one window and it is the quickfix window, create a
* one above the quickfix window. * new one above the quickfix window.
*/ */
if (((firstwin == lastwin) && bt_quickfix(curbuf)) || !usable_win) if (((firstwin == lastwin) && bt_quickfix(curbuf)) || !usable_win)
{ {
@ -2981,6 +2981,7 @@ ex_vimgrep(eap)
buf_T *buf; buf_T *buf;
int duplicate_name = FALSE; int duplicate_name = FALSE;
int using_dummy; int using_dummy;
int redraw_for_dummy = FALSE;
int found_match; int found_match;
buf_T *first_match_buf = NULL; buf_T *first_match_buf = NULL;
time_t seconds = 0; time_t seconds = 0;
@ -3097,6 +3098,7 @@ ex_vimgrep(eap)
/* Remember that a buffer with this name already exists. */ /* Remember that a buffer with this name already exists. */
duplicate_name = (buf != NULL); duplicate_name = (buf != NULL);
using_dummy = TRUE; using_dummy = TRUE;
redraw_for_dummy = TRUE;
#if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL) #if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
/* Don't do Filetype autocommands to avoid loading syntax and /* Don't do Filetype autocommands to avoid loading syntax and
@ -3243,11 +3245,29 @@ ex_vimgrep(eap)
if (qi->qf_lists[qi->qf_curlist].qf_count > 0) if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
{ {
if ((flags & VGR_NOJUMP) == 0) if ((flags & VGR_NOJUMP) == 0)
{
buf = curbuf;
qf_jump(qi, 0, 0, eap->forceit); qf_jump(qi, 0, 0, eap->forceit);
if (buf != curbuf)
/* If we jumped to another buffer redrawing will already be
* taken care of. */
redraw_for_dummy = FALSE;
}
} }
else else
EMSG2(_(e_nomatch2), s); EMSG2(_(e_nomatch2), s);
/* If we loaded a dummy buffer into the current window, the autocommands
* may have messed up things, need to redraw and recompute folds. */
if (redraw_for_dummy)
{
#ifdef FEAT_FOLDING
foldUpdateAll(curwin);
#else
redraw_later(NOT_VALID);
#endif
}
theend: theend:
vim_free(regmatch.regprog); vim_free(regmatch.regprog);
} }

2
src/version.c
View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
111,
/**/ /**/
110, 110,
/**/ /**/