Merge 'upstream/master' into pr-win-erw7

1 files changed, 11 insertions, 47 deletions

diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua
index df1aa938ed..79ca5363e0 100644
--- a/src/nvim/ex_cmds.lua
+++ b/src/nvim/ex_cmds.lua
@@ -28,15 +28,15 @@ local FILES      = bit.bor(XFILE, EXTRA)
 local WORD1      = bit.bor(EXTRA, NOSPC)
 local FILE1      = bit.bor(FILES, NOSPC)
 
-local ADDR_LINES            =  0
-local ADDR_WINDOWS          =  1
-local ADDR_ARGUMENTS        =  2
-local ADDR_LOADED_BUFFERS   =  3
-local ADDR_BUFFERS          =  4
-local ADDR_TABS             =  5
-local ADDR_TABS_RELATIVE    =  6
-local ADDR_QUICKFIX         =  7
-local ADDR_OTHER            =  99
+local ADDR_LINES            =  0    -- buffer line numbers
+local ADDR_WINDOWS          =  1    -- window number
+local ADDR_ARGUMENTS        =  2    -- argument number
+local ADDR_LOADED_BUFFERS   =  3    -- buffer number of loaded buffer
+local ADDR_BUFFERS          =  4    -- buffer number
+local ADDR_TABS             =  5    -- tab page number
+local ADDR_TABS_RELATIVE    =  6    -- Tab page that only relative
+local ADDR_QUICKFIX         =  7    -- quickfix list entry number
+local ADDR_OTHER            =  99   -- something else
 
 -- The following table is described in ex_cmds_defs.h file.
 return {
@@ -1707,24 +1707,6 @@ return {
     func='ex_next',
   },
   {
-    command='nbkey',
-    flags=bit.bor(EXTRA, NOTADR, NEEDARG),
-    addr_type=ADDR_LINES,
-    func='ex_ni',
-  },
-  {
-    command='nbclose',
-    flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
-    func='ex_ni',
-  },
-  {
-    command='nbstart',
-    flags=bit.bor(WORD1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
-    func='ex_ni',
-  },
-  {
     command='new',
     flags=bit.bor(BANG, FILE1, RANGE, NOTADR, EDITCMD, ARGOPT, TRLBAR),
     addr_type=ADDR_LINES,
@@ -1959,18 +1941,6 @@ return {
     func='ex_previous',
   },
   {
-    command='promptfind',
-    flags=bit.bor(EXTRA, NOTRLCOM, CMDWIN),
-    addr_type=ADDR_LINES,
-    func='ex_ni',
-  },
-  {
-    command='promptrepl',
-    flags=bit.bor(EXTRA, NOTRLCOM, CMDWIN),
-    addr_type=ADDR_LINES,
-    func='ex_ni',
-  },
-  {
     command='profile',
     flags=bit.bor(BANG, EXTRA, TRLBAR, CMDWIN),
     addr_type=ADDR_LINES,
@@ -2326,8 +2296,8 @@ return {
   },
   {
     command='scriptnames',
-    flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    flags=bit.bor(BANG, RANGE, NOTADR, COUNT, TRLBAR, CMDWIN),
+    addr_type=ADDR_OTHER,
     func='ex_scriptnames',
   },
   {
@@ -3117,12 +3087,6 @@ return {
     func='do_wqall',
   },
   {
-    command='wsverb',
-    flags=bit.bor(EXTRA, NOTADR, NEEDARG),
-    addr_type=ADDR_LINES,
-    func='ex_ni',
-  },
-  {
     command='wshada',
     flags=bit.bor(BANG, FILE1, TRLBAR, CMDWIN),
     addr_type=ADDR_LINES,