updated for version 7.3.850

Problem:    ":vimgrep //" matches everywhere.
Solution:   Make it use the previous search pattern. (David Bürgin)

diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 9dd3baae0a48547c48e2786d72869e3fcc613eb8..4738be0c22db3f6d974a66341375c1cf05c865d3 100644 (file)
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -574,6 +574,8 @@ commands can be combined to create a NewGrep command: >
                        'ignorecase' applies.  To overrule it put |/\c| in the
                        pattern to ignore case or |/\C| to match case.
                        'smartcase' is not used.
+                       If {pattern} is empty (e.g. // is specified), the last
+                       used search pattern is used. |last-pattern|
 
                        When a number is put before the command this is used
                        as the maximum number of matches to find.  Use

diff --git a/src/quickfix.c b/src/quickfix.c
index 2f8155a4c97717b4171bc64cda93fa1d68d9e8cf..0de6fe0b1948fcc234f5d4d2adea7d5be568e3af 100644 (file)
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -3179,7 +3179,20 @@ ex_vimgrep(eap)
        EMSG(_(e_invalpat));
        goto theend;
     }
-    regmatch.regprog = vim_regcomp(s, RE_MAGIC);
+
+    if (s != NULL && *s == NUL)
+    {
+       /* Pattern is empty, use last search pattern. */
+       if (last_search_pat() == NULL)
+       {
+           EMSG(_(e_noprevre));
+           goto theend;
+       }
+       regmatch.regprog = vim_regcomp(last_search_pat(), RE_MAGIC);
+    }
+    else
+       regmatch.regprog = vim_regcomp(s, RE_MAGIC);
+
     if (regmatch.regprog == NULL)
        goto theend;
     regmatch.rmm_ic = p_ic;

diff --git a/src/version.c b/src/version.c
index 9b90b51e64b4dd3fcf957216b6e650acdb6f724c..b4234e0a361efcf35a65cb02c442e989a648e807 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    850,
 /**/
     849,
 /**/