diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-04-24 19:47:27 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-04-24 19:47:27 +0000 |
| commit | f9393ef5efde2f425fbd9e19363186f8c9103376 (patch) | |
| tree | ec493a8fec62c31f9fe21993c4907bf1c1f290cd /src/quickfix.c | |
| parent | 4a85b4156098a30daf5b15a7fb7587a1c7c99f94 (diff) | |
| download | vim-git-f9393ef5efde2f425fbd9e19363186f8c9103376.tar.gz | |
updated for version 7.0fv7.0f
Diffstat (limited to 'src/quickfix.c')
| -rw-r--r-- | src/quickfix.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/quickfix.c b/src/quickfix.c index 21b524ca0..739b8945b 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -2620,6 +2620,7 @@ ex_make(eap) unsigned len; win_T *wp = NULL; qf_info_T *qi = &ql_info; + int res; #ifdef FEAT_AUTOCMD char_u *au_name = NULL; @@ -2693,11 +2694,16 @@ ex_make(eap) (void)char_avail(); #endif - if (qf_init(wp, fname, (eap->cmdidx != CMD_make + res = qf_init(wp, fname, (eap->cmdidx != CMD_make && eap->cmdidx != CMD_lmake) ? p_gefm : p_efm, (eap->cmdidx != CMD_grepadd - && eap->cmdidx != CMD_lgrepadd)) > 0 - && !eap->forceit) + && eap->cmdidx != CMD_lgrepadd)); +#ifdef FEAT_AUTOCMD + if (au_name != NULL) + apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, + curbuf->b_fname, TRUE, curbuf); +#endif + if (res > 0 && !eap->forceit) { if (wp != NULL) qi = GET_LOC_LIST(wp); @@ -2707,12 +2713,6 @@ ex_make(eap) mch_remove(fname); vim_free(fname); vim_free(cmd); - -#ifdef FEAT_AUTOCMD - if (au_name != NULL) - apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, - curbuf->b_fname, TRUE, curbuf); -#endif } /* @@ -3168,6 +3168,12 @@ ex_vimgrep(eap) qf_update_buffer(qi); #endif +#ifdef FEAT_AUTOCMD + if (au_name != NULL) + apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, + curbuf->b_fname, TRUE, curbuf); +#endif + /* Jump to first match. */ if (qi->qf_lists[qi->qf_curlist].qf_count > 0) { @@ -3177,12 +3183,6 @@ ex_vimgrep(eap) else EMSG2(_(e_nomatch2), s); -#ifdef FEAT_AUTOCMD - if (au_name != NULL) - apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, - curbuf->b_fname, TRUE, curbuf); -#endif - theend: vim_free(regmatch.regprog); } |