From fa29bc94b5f9e3cfe5b8c9a104f301c975e711d4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 16 Jul 2022 13:49:48 +0800
Subject: [PATCH] vim-patch:8.2.0593: finding a user command is not optimal
 (#19386)

Problem:    Finding a user command is not optimal.
Solution:   Start further down in the list of commands.
https://github.com/vim/vim/commit/a494f56f885876c98a276f7acfa386bfbb344680
---
 src/nvim/ex_cmds.lua | 14 ++++++++------
 src/nvim/ex_docmd.c  |  2 ++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua
index 69ff37f23c..2bf867c32c 100644
--- a/src/nvim/ex_cmds.lua
+++ b/src/nvim/ex_cmds.lua
@@ -3298,6 +3298,7 @@ module.cmds = {
     addr_type='ADDR_LINES',
     func='ex_z',
   },
+  -- commands that don't start with a letter
   {
     command='!',
     enum='CMD_bang',
@@ -3347,12 +3348,6 @@ module.cmds = {
     addr_type='ADDR_LINES',
     func='ex_at',
   },
-  {
-    command='Next',
-    flags=bit.bor(EXTRA, RANGE, COUNT, BANG, CMDARG, ARGOPT, TRLBAR),
-    addr_type='ADDR_OTHER',
-    func='ex_previous',
-  },
   {
     command='~',
     enum='CMD_tilde',
@@ -3360,6 +3355,13 @@ module.cmds = {
     addr_type='ADDR_LINES',
     func='ex_substitute',
   },
+  -- commands that start with an uppercase letter
+  {
+    command='Next',
+    flags=bit.bor(EXTRA, RANGE, COUNT, BANG, CMDARG, ARGOPT, TRLBAR),
+    addr_type='ADDR_OTHER',
+    func='ex_previous',
+  },
 }
 
 return module
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 4e6846bf21..f0ee849047 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -3028,6 +3028,8 @@ char *find_ex_command(exarg_T *eap, int *full)
       if (ASCII_ISLOWER(c2)) {
         eap->cmdidx += cmdidxs2[CHAR_ORD_LOW(c1)][CHAR_ORD_LOW(c2)];
       }
+    } else if (ASCII_ISUPPER(eap->cmd[0])) {
+      eap->cmdidx = CMD_Next;
     } else {
       eap->cmdidx = CMD_bang;
     }