diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index e975d84..2d4117d 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3837,16 +3837,11 @@
 		    while (*p)
 		    {
 			if (*p == ' ')
-			{
 			    /* argument starts after a space */
 			    arg = p + 1;
-			}
-			else
-			{
-			    if (*p == '\\' && *(p + 1) != NUL)
-				++p; /* skip over escaped character */
-			    mb_ptr_adv(p);
-			}
+			else if (*p == '\\' && *(p + 1) != NUL)
+			    ++p; /* skip over escaped character */
+			mb_ptr_adv(p);
 		    }
 		    xp->xp_pattern = arg;
 		}
diff --git a/src/version.c b/src/version.c
index b39f5c5..f3b1435 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    617,
+/**/
     616,
 /**/
     615,