1 files changed, 16 insertions, 13 deletions
diff --git a/src/nvim/cmdexpand.c b/src/nvim/cmdexpand.c
index 761e915131..2952d631e4 100644
--- a/src/nvim/cmdexpand.c
+++ b/src/nvim/cmdexpand.c
@@ -1585,21 +1585,24 @@ static const char *set_context_by_cmdname(const char *cmd, cmdidx_T cmdidx, cons
   case CMD_dsplit:
     // Skip count.
     arg = (const char *)skipwhite(skipdigits(arg));
-    if (*arg == '/') {  // Match regexp, not just whole words.
-      for (++arg; *arg && *arg != '/'; arg++) {
-        if (*arg == '\\' && arg[1] != NUL) {
-          arg++;
-        }
+    if (*arg != '/') {
+      return NULL;
+    }
+
+    // Match regexp, not just whole words.
+    for (++arg; *arg && *arg != '/'; arg++) {
+      if (*arg == '\\' && arg[1] != NUL) {
+        arg++;
       }
-      if (*arg) {
-        arg = (const char *)skipwhite(arg + 1);
+    }
+    if (*arg) {
+      arg = (const char *)skipwhite(arg + 1);
 
-        // Check for trailing illegal characters.
-        if (*arg == NUL || strchr("|\"\n", *arg) == NULL) {
-          xp->xp_context = EXPAND_NOTHING;
-        } else {
-          return arg;
-        }
+      // Check for trailing illegal characters.
+      if (*arg == NUL || strchr("|\"\n", *arg) == NULL) {
+        xp->xp_context = EXPAND_NOTHING;
+      } else {
+        return arg;
       }
     }
     break;