# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1608151506 -3600
# Node ID d998222d314d5dae4f797c336183cf13aaab635e
# Parent  a5acdf9557e8ca8e80f32a8f10e3a7b192b74e82
patch 8.2.2148: Vim9: crash when user command doesn't match

Commit: https://github.com/vim/vim/commit/1c0aa97827f30e3051ee50a0690555c2c23c0ceb
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Dec 16 21:43:54 2020 +0100

    patch 8.2.2148: Vim9: crash when user command doesn't match

    Problem:    Vim9: crash when user command doesn't match.
    Solution:   Adjust command index. (closes https://github.com/vim/vim/issues/7479)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3520,7 +3520,7 @@ find_ex_command(
 		++p;
 	    p = find_ucmd(eap, p, full, NULL, NULL);
 	}
-	if (p == eap->cmd)
+	if (p == NULL || p == eap->cmd)
 	    eap->cmdidx = CMD_SIZE;
     }
 
diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -701,5 +701,14 @@ def Test_cmd_argument_without_colon()
   delete('Xfile')
 enddef
 
+def Test_ambiguous_user_cmd()
+  var lines =<< trim END
+      com Cmd1 eval 0
+      com Cmd2 eval 0
+      Cmd
+  END
+  CheckScriptFailure(lines, 'E464:')
+enddef
+
 
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2148,
+/**/
     2147,
 /**/
     2146,