diff options
| -rw-r--r-- | src/quickfix.c | 24 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 10 deletions
diff --git a/src/quickfix.c b/src/quickfix.c index 664b686bd..a285f284f 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -2742,6 +2742,13 @@ ex_make(eap) #ifdef FEAT_AUTOCMD char_u *au_name = NULL; + /* Redirect ":grep" to ":vimgrep" if 'grepprg' is "internal". */ + if (grep_internal(eap->cmdidx)) + { + ex_vimgrep(eap); + return; + } + switch (eap->cmdidx) { case CMD_make: au_name = (char_u *)"make"; break; @@ -2763,13 +2770,6 @@ ex_make(eap) } #endif - /* Redirect ":grep" to ":vimgrep" if 'grepprg' is "internal". */ - if (grep_internal(eap->cmdidx)) - { - ex_vimgrep(eap); - return; - } - if (eap->cmdidx == CMD_lmake || eap->cmdidx == CMD_lgrep || eap->cmdidx == CMD_lgrepadd) wp = curwin; @@ -3057,10 +3057,14 @@ ex_vimgrep(eap) switch (eap->cmdidx) { - case CMD_vimgrep: au_name = (char_u *)"vimgrep"; break; - case CMD_lvimgrep: au_name = (char_u *)"lvimgrep"; break; - case CMD_vimgrepadd: au_name = (char_u *)"vimgrepadd"; break; + case CMD_vimgrep: au_name = (char_u *)"vimgrep"; break; + case CMD_lvimgrep: au_name = (char_u *)"lvimgrep"; break; + case CMD_vimgrepadd: au_name = (char_u *)"vimgrepadd"; break; case CMD_lvimgrepadd: au_name = (char_u *)"lvimgrepadd"; break; + case CMD_grep: au_name = (char_u *)"grep"; break; + case CMD_lgrep: au_name = (char_u *)"lgrep"; break; + case CMD_grepadd: au_name = (char_u *)"grepadd"; break; + case CMD_lgrepadd: au_name = (char_u *)"lgrepadd"; break; default: break; } if (au_name != NULL) diff --git a/src/version.c b/src/version.c index 031a0715c..ac145160d 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 167, +/**/ 166, /**/ 165, |