1 files changed, 9 insertions, 0 deletions
diff --git a/src/cmdexpand.c b/src/cmdexpand.c
index 9508d669d..63f0cc7b1 100644
--- a/src/cmdexpand.c
+++ b/src/cmdexpand.c
@@ -1146,6 +1146,15 @@ set_one_cmd_context(
 	arg = skipwhite(arg);
     }
 
+    // Skip over ++argopt argument
+    if ((ea.argt & EX_ARGOPT) && *arg != NUL && STRNCMP(arg, "++", 2) == 0)
+    {
+	p = arg;
+	while (*p && !vim_isspace(*p))
+	    MB_PTR_ADV(p);
+	arg = skipwhite(p);
+    }
+
     // Check for '|' to separate commands and '"' to start comments.
     // Don't do this for ":read !cmd" and ":write !cmd".
     if ((ea.argt & EX_TRLBAR) && !usefilter)