Merge remote-tracking branch 'upstream/master' into usermarksusermarks

1 files changed, 13 insertions, 31 deletions

diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua
index 4bed1e94b9..c8b6ceab69 100644
--- a/src/nvim/ex_cmds.lua
+++ b/src/nvim/ex_cmds.lua
@@ -673,18 +673,6 @@ module.cmds = {
     func='ex_cc',
   },
   {
-    command='cscope',
-    flags=bit.bor(EXTRA, NOTRLCOM, XFILE),
-    addr_type='ADDR_NONE',
-    func='ex_cscope',
-  },
-  {
-    command='cstag',
-    flags=bit.bor(BANG, TRLBAR, WORD1),
-    addr_type='ADDR_NONE',
-    func='ex_cstag',
-  },
-  {
     command='cunmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, CTRLV, CMDWIN, LOCK_OK),
     addr_type='ADDR_NONE',
@@ -1117,12 +1105,6 @@ module.cmds = {
     func='ex_helptags',
   },
   {
-    command='hardcopy',
-    flags=bit.bor(RANGE, COUNT, EXTRA, TRLBAR, DFLALL, BANG),
-    addr_type='ADDR_LINES',
-    func='ex_hardcopy',
-  },
-  {
     command='highlight',
     flags=bit.bor(BANG, EXTRA, TRLBAR, SBOXOK, CMDWIN, LOCK_OK),
     addr_type='ADDR_NONE',
@@ -1141,6 +1123,12 @@ module.cmds = {
     func='ex_history',
   },
   {
+    command='horizontal',
+    flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
+    addr_type='ADDR_NONE',
+    func='ex_wrongmodifier',
+  },
+  {
     command='insert',
     flags=bit.bor(BANG, RANGE, TRLBAR, CMDWIN, LOCK_OK, MODIFY),
     addr_type='ADDR_LINES',
@@ -1399,12 +1387,6 @@ module.cmds = {
     func='ex_cclose',
   },
   {
-    command='lcscope',
-    flags=bit.bor(EXTRA, NOTRLCOM, XFILE),
-    addr_type='ADDR_NONE',
-    func='ex_cscope',
-  },
-  {
     command='ldo',
     flags=bit.bor(BANG, NEEDARG, EXTRA, NOTRLCOM, RANGE, DFLALL),
     addr_type='ADDR_QUICKFIX_VALID',
@@ -2405,7 +2387,7 @@ module.cmds = {
   },
   {
     command='scriptnames',
-    flags=bit.bor(BANG, RANGE, COUNT, TRLBAR, CMDWIN, LOCK_OK),
+    flags=bit.bor(BANG, FILES, RANGE, COUNT, TRLBAR, CMDWIN, LOCK_OK),
     addr_type='ADDR_OTHER',
     func='ex_scriptnames',
   },
@@ -2416,12 +2398,6 @@ module.cmds = {
     func='ex_scriptencoding',
   },
   {
-    command='scscope',
-    flags=bit.bor(EXTRA, NOTRLCOM),
-    addr_type='ADDR_NONE',
-    func='ex_scscope',
-  },
-  {
     command='set',
     flags=bit.bor(BANG, TRLBAR, EXTRA, CMDWIN, LOCK_OK, SBOXOK),
     addr_type='ADDR_NONE',
@@ -2952,6 +2928,12 @@ module.cmds = {
     func='ex_tag',
   },
   {
+    command='trust',
+    flags=bit.bor(EXTRA, FILE1, TRLBAR, LOCK_OK),
+    addr_type='ADDR_NONE',
+    func='ex_trust',
+  },
+  {
     command='try',
     flags=bit.bor(TRLBAR, SBOXOK, CMDWIN, LOCK_OK),
     addr_type='ADDR_NONE',