updated for version 7.4.233

Problem:    Escaping special characters for using "%" with a shell command is
            inconsistant, parenthesis are escaped but spaces are not.
Solution:   Only escape "!". (Gary Johnson)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index f1aa60798d1de011ab0cb5c8602149f74e88ac24..b616740751ef6849a095e5f16b93337ddaed1a02 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -4580,25 +4580,15 @@ expand_filename(eap, cmdlinep, errormsgp)
 
        /* For a shell command a '!' must be escaped. */
        if ((eap->usefilter || eap->cmdidx == CMD_bang)
-                           && vim_strpbrk(repl, (char_u *)"!&;()<>") != NULL)
+                           && vim_strpbrk(repl, (char_u *)"!") != NULL)
        {
            char_u      *l;
 
-           l = vim_strsave_escaped(repl, (char_u *)"!&;()<>");
+           l = vim_strsave_escaped(repl, (char_u *)"!");
            if (l != NULL)
            {
                vim_free(repl);
                repl = l;
-               /* For a sh-like shell escape "!" another time. */
-               if (strstr((char *)p_sh, "sh") != NULL)
-               {
-                   l = vim_strsave_escaped(repl, (char_u *)"!");
-                   if (l != NULL)
-                   {
-                       vim_free(repl);
-                       repl = l;
-                   }
-               }
            }
        }
 

diff --git a/src/version.c b/src/version.c
index 1780946fc5d37d88fb63138c6b713451286f241f..0fcea78a3372c095104c444378a26f81e77e83db 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    233,
 /**/
     232,
 /**/