updated for version 7.3.851

Problem:    Using an empty pattern with :sort silently continues when there is
            no previous search pattern.
Solution:   Give an error message.

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index c7135a3d7b742e0ac69d0b497d181f6c3703cded..d6bd0ebeb5baacc8b9f63b9aba9ef45f7913dcdb 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -415,8 +415,15 @@ ex_sort(eap)
            }
            *s = NUL;
            /* Use last search pattern if sort pattern is empty. */
-           if (s == p + 1 && last_search_pat() != NULL)
+           if (s == p + 1)
+           {
+               if (last_search_pat() == NULL)
+               {
+                   EMSG(_(e_noprevre));
+                   goto sortend;
+               }
                regmatch.regprog = vim_regcomp(last_search_pat(), RE_MAGIC);
+           }
            else
                regmatch.regprog = vim_regcomp(p + 1, RE_MAGIC);
            if (regmatch.regprog == NULL)

diff --git a/src/version.c b/src/version.c
index b4234e0a361efcf35a65cb02c442e989a648e807..97fdd990cadf2105ad4d97218f4689ceebc18844 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 */
+/**/
+    851,
 /**/
     850,
 /**/