From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 1 Apr 2014 16:54:48 +0000 (+0200)
Subject: updated for version 7.4.233
X-Git-Tag: v7.4.233
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31b7d38611541030fe54898a7d8b6a714fa0fa59;p=vim

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 f1aa60798..b61674075 100644
--- 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 1780946fc..0fcea78a3 100644
--- 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,
 /**/