diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index d7ef7d5..6d036ff 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3338,12 +3338,13 @@
 		}
 		in_quote = !in_quote;
 	    }
+	    /* An argument can contain just about everything, except
+	     * characters that end the command and white space. */
+	    else if (c == '|' || c == '\n' || c == '"' || (vim_iswhite(c)
 #ifdef SPACE_IN_FILENAME
-	    else if (!vim_isfilec_or_wc(c)
-					 && (!(ea.argt & NOSPC) || usefilter))
-#else
-	    else if (!vim_isfilec_or_wc(c))
+					 && (!(ea.argt & NOSPC) || usefilter)
 #endif
+		    ))
 	    {
 		while (*p != NUL)
 		{
diff --git a/src/version.c b/src/version.c
index 34003b9..7ba507f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    226,
+/**/
     225,
 /**/
     224,