patch 8.1.1241: Ex command info contains confusing informationv8.1.1241

Problem:    Ex command info contains confusing information.
Solution:   When using the NOTADR flag use ADDR_OTHER for the address type.
            Cleanup code using NOTADR.  Check for errors in
            create_cmdidxs.vim.  Adjust Makefile to see the errors.

9 files changed, 769 insertions, 700 deletions

diff --git a/src/Makefile b/src/Makefile
index 19b59c2908..65e7981449 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1987,7 +1987,7 @@ autoconf:
 # If this fails because you don't have Vim yet, first build and install Vim
 # without changes.
 cmdidxs: ex_cmds.h
-	vim -u NONE -i NONE -X -S create_cmdidxs.vim
+	vim --clean -X -u create_cmdidxs.vim
 
 
 # The normal command to compile a .c file to its .o file.
diff --git a/src/create_cmdidxs.vim b/src/create_cmdidxs.vim
index c306ccb872..1d73c5faaf 100644
--- a/src/create_cmdidxs.vim
+++ b/src/create_cmdidxs.vim
@@ -10,7 +10,10 @@
 let cmds = []
 let skipped_cmds = 0
 
-for line in readfile('ex_cmds.h')
+let lines = readfile('ex_cmds.h')
+let idx = 0
+while idx < len(lines)
+  let line = lines[idx]
   if line =~ '^EX(CMD_'
     let m = matchlist(line, '^EX(CMD_\S*,\s*"\([a-z][^"]*\)"')
     if len(m) >= 2
@@ -18,8 +21,28 @@ for line in readfile('ex_cmds.h')
     else
       let skipped_cmds += 1
     endif
+
+    let idx += 1
+    let flags = lines[idx]
+    let idx += 1
+    let addr_type = lines[idx]
+
+    if flags =~ '\<RANGE\>'
+      if addr_type =~ 'ADDR_NONE'
+	echoerr 'ex_cmds.h:' .. (idx - 1) .. ': Using RANGE with ADDR_NONE: ' .. line
+      endif
+    else
+      if addr_type !~ 'ADDR_NONE'
+	echoerr 'ex_cmds.h:' .. (idx - 1) .. ': Missing ADDR_NONE: ' .. line
+      endif
+    endif
+
+    if flags =~ '\<DFLALL\>' && (addr_type =~ 'ADDR_OTHER' || addr_type =~ 'ADDR_NONE')
+      echoerr 'ex_cmds.h:' .. (idx - 1) .. ': Missing misplaced DFLALL: ' .. line
+    endif
   endif
-endfor
+  let idx += 1
+endwhile
 
 let cmdidxs1 = {}
 let cmdidxs2 = {}
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 991dc458e2..ebfcf54537 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3157,6 +3157,13 @@ ex_update(exarg_T *eap)
     void
 ex_write(exarg_T *eap)
 {
+    if (eap->cmdidx == CMD_saveas)
+    {
+	// :saveas does not take a range, uses all lines.
+	eap->line1 = 1;
+	eap->line2 = curbuf->b_ml.ml_line_count;
+    }
+
     if (eap->usefilter)		/* input lines to shell command */
 	do_bang(1, eap, FALSE, TRUE, FALSE);
     else
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 27029baf0b..63196afd32 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -28,50 +28,56 @@
  */
 
 #ifdef RANGE
-# undef RANGE			/* SASC on Amiga defines it */
+# undef RANGE			// SASC on Amiga defines it
 #endif
 
-#define RANGE		0x001	/* allow a linespecs */
-#define BANG		0x002	/* allow a ! after the command name */
-#define EXTRA		0x004	/* allow extra args after command name */
-#define XFILE		0x008	/* expand wildcards in extra part */
-#define NOSPC		0x010	/* no spaces allowed in the extra part */
-#define	DFLALL		0x020	/* default file range is 1,$ */
-#define WHOLEFOLD	0x040	/* extend range to include whole fold also
-				   when less than two numbers given */
-#define NEEDARG		0x080	/* argument required */
-#define TRLBAR		0x100	/* check for trailing vertical bar */
-#define REGSTR		0x200	/* allow "x for register designation */
-#define COUNT		0x400	/* allow count in argument, after command */
-#define NOTRLCOM	0x800	/* no trailing comment allowed */
-#define ZEROR	       0x1000	/* zero line number allowed */
-#define USECTRLV       0x2000	/* do not remove CTRL-V from argument */
-#define NOTADR	       0x4000	/* number before command is not an address */
-#define EDITCMD	       0x8000	/* allow "+command" argument */
-#define BUFNAME	      0x10000L	/* accepts buffer name */
-#define BUFUNL	      0x20000L	/* accepts unlisted buffer too */
-#define ARGOPT	      0x40000L	/* allow "++opt=val" argument */
-#define SBOXOK	      0x80000L	/* allowed in the sandbox */
-#define CMDWIN	     0x100000L	/* allowed in cmdline window; when missing
-				 * disallows editing another buffer when
-				 * curbuf_lock is set */
-#define MODIFY       0x200000L	/* forbidden in non-'modifiable' buffer */
-#define EXFLAGS      0x400000L	/* allow flags after count in argument */
-#define RESTRICT     0x800000L	/* forbidden in restricted mode */
-#define FILES	(XFILE | EXTRA)	/* multiple extra files allowed */
-#define WORD1	(EXTRA | NOSPC)	/* one extra word allowed */
-#define FILE1	(FILES | NOSPC)	/* 1 file allowed, defaults to current file */
+#define RANGE		0x001	// allow a linespecs
+#define BANG		0x002	// allow a ! after the command name
+#define EXTRA		0x004	// allow extra args after command name
+#define XFILE		0x008	// expand wildcards in extra part
+#define NOSPC		0x010	// no spaces allowed in the extra part
+#define	DFLALL		0x020	// default file range is 1,$
+#define WHOLEFOLD	0x040	// extend range to include whole fold also
+				// when less than two numbers given
+#define NEEDARG		0x080	// argument required
+#define TRLBAR		0x100	// check for trailing vertical bar
+#define REGSTR		0x200	// allow "x for register designation
+#define COUNT		0x400	// allow count in argument, after command
+#define NOTRLCOM	0x800	// no trailing comment allowed
+#define ZEROR	       0x1000	// zero line number allowed
+#define USECTRLV       0x2000	// do not remove CTRL-V from argument
+#define EDITCMD	       0x4000	// allow "+command" argument
+#define BUFNAME	       0x8000	// accepts buffer name
+#define BUFUNL	      0x10000L	// accepts unlisted buffer too
+#define ARGOPT	      0x20000L	// allow "++opt=val" argument
+#define SBOXOK	      0x40000L	// allowed in the sandbox
+#define CMDWIN	      0x80000L	// allowed in cmdline window; when missing
+				// disallows editing another buffer when
+				// curbuf_lock is set
+#define MODIFY       0x100000L	// forbidden in non-'modifiable' buffer
+#define EXFLAGS      0x200000L	// allow flags after count in argument
+#define RESTRICT     0x400000L	// forbidden in restricted mode
+#define FILES	(XFILE | EXTRA)	// multiple extra files allowed
+#define WORD1	(EXTRA | NOSPC)	// one extra word allowed
+#define FILE1	(FILES | NOSPC)	// 1 file allowed, defaults to current file
 
-/* values for cmd_addr_type */
-#define ADDR_LINES		0   // buffer line numbers
-#define ADDR_WINDOWS		1   // window number
-#define ADDR_ARGUMENTS		2   // argument number
-#define ADDR_LOADED_BUFFERS	3   // buffer number of loaded buffer
-#define ADDR_BUFFERS		4   // buffer number
-#define ADDR_TABS		5   // tab page number
-#define ADDR_TABS_RELATIVE	6   // Tab page that only relative
-#define ADDR_QUICKFIX		7   // quickfix list entry number
-#define ADDR_OTHER		99  // something else
+#ifndef DO_DECLARE_EXCMD
+/*
+ * values for cmd_addr_type
+ */
+typedef enum {
+    ADDR_LINES,		 // buffer line numbers
+    ADDR_WINDOWS,	 // window number
+    ADDR_ARGUMENTS,	 // argument number
+    ADDR_LOADED_BUFFERS, // buffer number of loaded buffer
+    ADDR_BUFFERS,	 // buffer number
+    ADDR_TABS,		 // tab page number
+    ADDR_TABS_RELATIVE,	 // Tab page that only relative
+    ADDR_QUICKFIX,	 // quickfix list entry number
+    ADDR_OTHER,		 // something else
+    ADDR_NONE		 // no range used
+} cmd_addr_T;
+#endif
 
 #ifndef DO_DECLARE_EXCMD
 typedef struct exarg exarg_T;
@@ -95,10 +101,10 @@ typedef void (*ex_func_T) (exarg_T *eap);
 
 static struct cmdname
 {
-    char_u	*cmd_name;	/* name of the command */
-    ex_func_T   cmd_func;	/* function for this command */
-    long_u	cmd_argt;	/* flags declared above */
-    int		cmd_addr_type;	/* flag for address type */
+    char_u	*cmd_name;	// name of the command
+    ex_func_T   cmd_func;	// function for this command
+    long_u	cmd_argt;	// flags declared above
+    cmd_addr_T	cmd_addr_type;	// flag for address type
 } cmdnames[] =
 #else
 # define EX(a, b, c, d, e)  a
@@ -110,355 +116,355 @@ EX(CMD_append,		"append",	ex_append,
 			ADDR_LINES),
 EX(CMD_abbreviate,	"abbreviate",	ex_abbreviate,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_abclear,		"abclear",	ex_abclear,
 			EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_aboveleft,	"aboveleft",	ex_wrongmodifier,
 			NEEDARG|EXTRA|NOTRLCOM,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_all,		"all",		ex_all,
-			BANG|RANGE|NOTADR|COUNT|TRLBAR,
-			ADDR_LINES),
+			BANG|RANGE|COUNT|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_amenu,		"amenu",	ex_menu,
-			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			RANGE|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_OTHER),
 EX(CMD_anoremenu,	"anoremenu",	ex_menu,
-			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			RANGE|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_OTHER),
 EX(CMD_args,		"args",		ex_args,
 			BANG|FILES|EDITCMD|ARGOPT|TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_argadd,		"argadd",	ex_argadd,
-			BANG|RANGE|NOTADR|ZEROR|FILES|TRLBAR,
+			BANG|RANGE|ZEROR|FILES|TRLBAR,
 			ADDR_ARGUMENTS),
 EX(CMD_argdelete,	"argdelete",	ex_argdelete,
-			BANG|RANGE|NOTADR|FILES|TRLBAR,
+			BANG|RANGE|FILES|TRLBAR,
 			ADDR_ARGUMENTS),
 EX(CMD_argdo,		"argdo",	ex_listdo,
-			BANG|NEEDARG|EXTRA|NOTRLCOM|RANGE|NOTADR|DFLALL,
+			BANG|NEEDARG|EXTRA|NOTRLCOM|RANGE|DFLALL,
 			ADDR_ARGUMENTS),
 EX(CMD_argedit,		"argedit",	ex_argedit,
-			BANG|NEEDARG|RANGE|NOTADR|ZEROR|FILES|EDITCMD|ARGOPT|TRLBAR,
+			BANG|NEEDARG|RANGE|ZEROR|FILES|EDITCMD|ARGOPT|TRLBAR,
 			ADDR_ARGUMENTS),
 EX(CMD_argglobal,	"argglobal",	ex_args,
 			BANG|FILES|EDITCMD|ARGOPT|TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_arglocal,	"arglocal",	ex_args,
 			BANG|FILES|EDITCMD|ARGOPT|TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_argument,	"argument",	ex_argument,
-			BANG|RANGE|NOTADR|COUNT|EXTRA|EDITCMD|ARGOPT|TRLBAR,
+			BANG|RANGE|COUNT|EXTRA|EDITCMD|ARGOPT|TRLBAR,
 			ADDR_ARGUMENTS),
 EX(CMD_ascii,		"ascii",	do_ascii,
 			TRLBAR|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_autocmd,		"autocmd",	ex_autocmd,
 			BANG|EXTRA|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_augroup,		"augroup",	ex_autocmd,
 			BANG|WORD1|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_aunmenu,		"aunmenu",	ex_menu,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_buffer,		"buffer",	ex_buffer,
-			BANG|RANGE|NOTADR|BUFNAME|BUFUNL|COUNT|EXTRA|EDITCMD|TRLBAR,
+			BANG|RANGE|BUFNAME|BUFUNL|COUNT|EXTRA|EDITCMD|TRLBAR,
 			ADDR_BUFFERS),
 EX(CMD_bNext,		"bNext",	ex_bprevious,
-			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR,
-			ADDR_LINES),
+			BANG|RANGE|COUNT|EDITCMD|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_ball,		"ball",		ex_buffer_all,
-			RANGE|NOTADR|COUNT|TRLBAR,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_badd,		"badd",		ex_edit,
 			NEEDARG|FILE1|EDITCMD|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_bdelete,		"bdelete",	ex_bunload,
-			BANG|RANGE|NOTADR|BUFNAME|COUNT|EXTRA|TRLBAR,
+			BANG|RANGE|BUFNAME|COUNT|EXTRA|TRLBAR,
 			ADDR_BUFFERS),
 EX(CMD_behave,		"behave",	ex_behave,
 			BANG|NEEDARG|WORD1|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_belowright,	"belowright",	ex_wrongmodifier,
 			NEEDARG|EXTRA|NOTRLCOM,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_bfirst,		"bfirst",	ex_brewind,
-			BANG|RANGE|NOTADR|EDITCMD|TRLBAR,
-			ADDR_LINES),
+			BANG|RANGE|EDITCMD|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_blast,		"blast",	ex_blast,
-			BANG|RANGE|NOTADR|EDITCMD|TRLBAR,
-			ADDR_LINES),
+			BANG|RANGE|EDITCMD|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_bmodified,	"bmodified",	ex_bmodified,
-			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR,
-			ADDR_LINES),
+			BANG|RANGE|COUNT|EDITCMD|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_bnext,		"bnext",	ex_bnext,
-			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR,
-			ADDR_LINES),
+			BANG|RANGE|COUNT|EDITCMD|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_botright,	"botright",	ex_wrongmodifier,
 			NEEDARG|EXTRA|NOTRLCOM,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_bprevious,	"bprevious",	ex_bprevious,
-			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR,
-			ADDR_LINES),
+			BANG|RANGE|COUNT|EDITCMD|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_brewind,		"brewind",	ex_brewind,
-			BANG|RANGE|NOTADR|EDITCMD|TRLBAR,
-			ADDR_LINES),
+			BANG|RANGE|EDITCMD|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_break,		"break",	ex_break,
 			TRLBAR|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_breakadd,	"breakadd",	ex_breakadd,
 			EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_breakdel,	"breakdel",	ex_breakdel,
 			EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_breaklist,	"breaklist",	ex_breaklist,
 			EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_browse,		"browse",	ex_wrongmodifier,
 			NEEDARG|EXTRA|NOTRLCOM|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_buffers,		"buffers",	buflist_list,
 			BANG|EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_bufdo,		"bufdo",	ex_listdo,
-			BANG|NEEDARG|EXTRA|NOTRLCOM|RANGE|NOTADR|DFLALL,
+			BANG|NEEDARG|EXTRA|NOTRLCOM|RANGE|DFLALL,
 			ADDR_BUFFERS),
 EX(CMD_bunload,		"bunload",	ex_bunload,
-			BANG|RANGE|NOTADR|BUFNAME|COUNT|EXTRA|TRLBAR,
+			BANG|RANGE|BUFNAME|COUNT|EXTRA|TRLBAR,
 			ADDR_LOADED_BUFFERS),
 EX(CMD_bwipeout,	"bwipeout",	ex_bunload,
-			BANG|RANGE|NOTADR|BUFNAME|BUFUNL|COUNT|EXTRA|TRLBAR,
+			BANG|RANGE|BUFNAME|BUFUNL|COUNT|EXTRA|TRLBAR,
 			ADDR_BUFFERS),
 EX(CMD_change,		"change",	ex_change,
 			BANG|WHOLEFOLD|RANGE|COUNT|TRLBAR|CMDWIN|MODIFY,
 			ADDR_LINES),
 EX(CMD_cNext,		"cNext",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR|BANG,
+			ADDR_OTHER),
 EX(CMD_cNfile,		"cNfile",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR|BANG,
+			ADDR_OTHER),
 EX(CMD_cabbrev,		"cabbrev",	ex_abbreviate,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cabclear,	"cabclear",	ex_abclear,
 			EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_caddbuffer,	"caddbuffer",	ex_cbuffer,
-			RANGE|NOTADR|WORD1|TRLBAR,
-			ADDR_LINES),
+			RANGE|WORD1|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_caddexpr,	"caddexpr",	ex_cexpr,
 			NEEDARG|WORD1|NOTRLCOM|TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_caddfile,	"caddfile",	ex_cfile,
 			TRLBAR|FILE1,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_call,		"call",		ex_call,
 			RANGE|NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
 			ADDR_LINES),
 EX(CMD_catch,		"catch",	ex_catch,
 			EXTRA|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cbuffer,		"cbuffer",	ex_cbuffer,
-			BANG|RANGE|NOTADR|WORD1|TRLBAR,
-			ADDR_LINES),
+			BANG|RANGE|WORD1|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_cbottom,		"cbottom",	ex_cbottom,
 			TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cc,		"cc",		ex_cc,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR|BANG,
+			ADDR_OTHER),
 EX(CMD_cclose,		"cclose",	ex_cclose,
-			RANGE|NOTADR|COUNT|TRLBAR,
-			ADDR_LINES),
+			TRLBAR,
+			ADDR_NONE),
 EX(CMD_cd,		"cd",		ex_cd,
 			BANG|FILE1|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cdo,		"cdo",		ex_listdo,
-			BANG|NEEDARG|EXTRA|NOTRLCOM|RANGE|NOTADR|DFLALL,
+			BANG|NEEDARG|EXTRA|NOTRLCOM|RANGE|DFLALL,
 			ADDR_QUICKFIX),
 EX(CMD_center,		"center",	ex_align,
 			TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY,
 			ADDR_LINES),
 EX(CMD_cexpr,		"cexpr",	ex_cexpr,
 			NEEDARG|WORD1|NOTRLCOM|TRLBAR|BANG,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cfile,		"cfile",	ex_cfile,
 			TRLBAR|FILE1|BANG,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cfdo,		"cfdo",		ex_listdo,
-			BANG|NEEDARG|EXTRA|NOTRLCOM|RANGE|NOTADR|DFLALL,
+			BANG|NEEDARG|EXTRA|NOTRLCOM|RANGE|DFLALL,
 			ADDR_QUICKFIX),
 EX(CMD_cfirst,		"cfirst",	ex_cc,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR|BANG,
+			ADDR_OTHER),
 EX(CMD_cgetfile,	"cgetfile",	ex_cfile,
 			TRLBAR|FILE1,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cgetbuffer,	"cgetbuffer",	ex_cbuffer,
-			RANGE|NOTADR|WORD1|TRLBAR,
-			ADDR_LINES),
+			RANGE|WORD1|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_cgetexpr,	"cgetexpr",	ex_cexpr,
 			NEEDARG|WORD1|NOTRLCOM|TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_chdir,		"chdir",	ex_cd,
 			BANG|FILE1|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_changes,		"changes",	ex_changes,
 			TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_checkpath,	"checkpath",	ex_checkpath,
 			TRLBAR|BANG|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_checktime,	"checktime",	ex_checktime,
-			RANGE|NOTADR|BUFNAME|COUNT|EXTRA|TRLBAR,
-			ADDR_LINES),
+			RANGE|BUFNAME|COUNT|EXTRA|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_chistory,	"chistory",	qf_history,
 			TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_clist,		"clist",	qf_list,
 			BANG|EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_clast,		"clast",	ex_cc,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR|BANG,
+			ADDR_OTHER),
 EX(CMD_close,		"close",	ex_close,
-			BANG|RANGE|NOTADR|COUNT|TRLBAR|CMDWIN,
+			BANG|RANGE|COUNT|TRLBAR|CMDWIN,
 			ADDR_WINDOWS),
 EX(CMD_clearjumps,	"clearjumps",	ex_clearjumps,
 			TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cmap,		"cmap",		ex_map,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cmapclear,	"cmapclear",	ex_mapclear,
 			EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cmenu,		"cmenu",	ex_menu,
-			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			RANGE|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_OTHER),
 EX(CMD_cnext,		"cnext",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR|BANG,
+			ADDR_OTHER),
 EX(CMD_cnewer,		"cnewer",	qf_age,
-			RANGE|NOTADR|COUNT|TRLBAR,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_cnfile,		"cnfile",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR|BANG,
+			ADDR_OTHER),
 EX(CMD_cnoremap,	"cnoremap",	ex_map,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cnoreabbrev,	"cnoreabbrev",	ex_abbreviate,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cnoremenu,	"cnoremenu",	ex_menu,
-			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			RANGE|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_OTHER),
 EX(CMD_copy,		"copy",		ex_copymove,
 			RANGE|WHOLEFOLD|EXTRA|TRLBAR|CMDWIN|MODIFY,
 			ADDR_LINES),
 EX(CMD_colder,		"colder",	qf_age,
-			RANGE|NOTADR|COUNT|TRLBAR,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_colorscheme,	"colorscheme",	ex_colorscheme,
 			WORD1|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_command,		"command",	ex_command,
 			EXTRA|BANG|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_comclear,	"comclear",	ex_comclear,
 			TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_compiler,	"compiler",	ex_compiler,
 			BANG|TRLBAR|WORD1|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_continue,	"continue",	ex_continue,
 			TRLBAR|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_confirm,		"confirm",	ex_wrongmodifier,
 			NEEDARG|EXTRA|NOTRLCOM|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_copen,		"copen",	ex_copen,
-			RANGE|NOTADR|COUNT|TRLBAR,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_cprevious,	"cprevious",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR|BANG,
+			ADDR_OTHER),
 EX(CMD_cpfile,		"cpfile",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR|BANG,
+			ADDR_OTHER),
 EX(CMD_cquit,		"cquit",	ex_cquit,
 			TRLBAR|BANG,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_crewind,		"crewind",	ex_cc,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR|BANG,
+			ADDR_OTHER),
 EX(CMD_cscope,		"cscope",	ex_cscope,
 			EXTRA|NOTRLCOM|XFILE,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cstag,		"cstag",	ex_cstag,
 			BANG|TRLBAR|WORD1,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cunmap,		"cunmap",	ex_unmap,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cunabbrev,	"cunabbrev",	ex_abbreviate,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cunmenu,		"cunmenu",	ex_menu,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_cwindow,		"cwindow",	ex_cwindow,
-			RANGE|NOTADR|COUNT|TRLBAR,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_delete,		"delete",	ex_operators,
 			RANGE|WHOLEFOLD|REGSTR|COUNT|TRLBAR|CMDWIN|MODIFY,
 			ADDR_LINES),
 EX(CMD_delmarks,	"delmarks",	ex_delmarks,
 			BANG|EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_debug,		"debug",	ex_debug,
 			NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_debuggreedy,	"debuggreedy",	ex_debuggreedy,
-			RANGE|NOTADR|ZEROR|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			RANGE|ZEROR|TRLBAR|CMDWIN,
+			ADDR_OTHER),
 EX(CMD_delcommand,	"delcommand",	ex_delcommand,
 			NEEDARG|WORD1|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_delfunction,	"delfunction",	ex_delfunction,
 			BANG|NEEDARG|WORD1|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_display,		"display",	ex_display,
 			EXTRA|NOTRLCOM|TRLBAR|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_diffupdate,	"diffupdate",	ex_diffupdate,
 			BANG|TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_diffget,		"diffget",	ex_diffgetput,
 			RANGE|EXTRA|TRLBAR|MODIFY,
 			ADDR_LINES),
 EX(CMD_diffoff,		"diffoff",	ex_diffoff,
 			BANG|TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_diffpatch,	"diffpatch",	ex_diffpatch,
 			EXTRA|FILE1|TRLBAR|MODIFY,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_diffput,		"diffput",	ex_diffgetput,
 			RANGE|EXTRA|TRLBAR,
 			ADDR_LINES),
 EX(CMD_diffsplit,	"diffsplit",	ex_diffsplit,
 			EXTRA|FILE1|TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_diffthis,	"diffthis",	ex_diffthis,
 			TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_digraphs,	"digraphs",	ex_digraphs,
 			BANG|EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_djump,		"djump",	ex_findpat,
 			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA,
 			ADDR_LINES),
@@ -467,13 +473,13 @@ EX(CMD_dlist,		"dlist",	ex_findpat,
 			ADDR_LINES),
 EX(CMD_doautocmd,	"doautocmd",	ex_doautocmd,
 			EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_doautoall,	"doautoall",	ex_doautoall,
 			EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_drop,		"drop",		ex_drop,
 			FILES|EDITCMD|NEEDARG|ARGOPT|TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_dsearch,		"dsearch",	ex_findpat,
 			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN,
 			ADDR_LINES),
@@ -482,91 +488,91 @@ EX(CMD_dsplit,		"dsplit",	ex_findpat,
 			ADDR_LINES),
 EX(CMD_edit,		"edit",		ex_edit,
 			BANG|FILE1|EDITCMD|ARGOPT|TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_earlier,		"earlier",	ex_later,
 			TRLBAR|EXTRA|NOSPC|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_echo,		"echo",		ex_echo,
 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_echoerr,		"echoerr",	ex_execute,
 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_echohl,		"echohl",	ex_echohl,
 			EXTRA|TRLBAR|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_echomsg,		"echomsg",	ex_execute,
 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_echon,		"echon",	ex_echo,
 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_else,		"else",		ex_else,
 			TRLBAR|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_elseif,		"elseif",	ex_else,
 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_emenu,		"emenu",	ex_emenu,
-			NEEDARG|EXTRA|TRLBAR|NOTRLCOM|RANGE|NOTADR|CMDWIN,
-			ADDR_LINES),
+			NEEDARG|EXTRA|TRLBAR|NOTRLCOM|RANGE|CMDWIN,
+			ADDR_OTHER),
 EX(CMD_endif,		"endif",	ex_endif,
 			TRLBAR|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_endfunction,	"endfunction",	ex_endfunction,
 			TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_endfor,		"endfor",	ex_endwhile,
 			TRLBAR|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_endtry,		"endtry",	ex_endtry,
 			TRLBAR|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_endwhile,	"endwhile",	ex_endwhile,
 			TRLBAR|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_enew,		"enew",		ex_edit,
 			BANG|TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_ex,		"ex",		ex_edit,
 			BANG|FILE1|EDITCMD|ARGOPT|TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_execute,		"execute",	ex_execute,
 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_exit,		"exit",		ex_exit,
 			RANGE|WHOLEFOLD|BANG|FILE1|ARGOPT|DFLALL|TRLBAR|CMDWIN,
 			ADDR_LINES),
 EX(CMD_exusage,		"exusage",	ex_exusage,
 			TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_file,		"file",		ex_file,
-			RANGE|NOTADR|ZEROR|BANG|FILE1|TRLBAR,
-			ADDR_LINES),
+			RANGE|ZEROR|BANG|FILE1|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_files,		"files",	buflist_list,
 			BANG|EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_filetype,	"filetype",	ex_filetype,
 			EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_filter,		"filter",	ex_wrongmodifier,
 			BANG|NEEDARG|EXTRA|NOTRLCOM,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_find,		"find",		ex_find,
-			RANGE|NOTADR|BANG|FILE1|EDITCMD|ARGOPT|TRLBAR,
-			ADDR_LINES),
+			RANGE|BANG|FILE1|EDITCMD|ARGOPT|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_finally,		"finally",	ex_finally,
 			TRLBAR|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_finish,		"finish",	ex_finish,
 			TRLBAR|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_first,		"first",	ex_rewind,
 			EXTRA|BANG|EDITCMD|ARGOPT|TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_fixdel,		"fixdel",	do_fixdel,
 			TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_fold,		"fold",		ex_fold,
 			RANGE|WHOLEFOLD|TRLBAR|SBOXOK|CMDWIN,
 			ADDR_LINES),
@@ -584,67 +590,67 @@ EX(CMD_foldopen,	"foldopen",	ex_foldopen,
 			ADDR_LINES),
 EX(CMD_for,		"for",		ex_while,
 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_function,	"function",	ex_function,
 			EXTRA|BANG|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_global,		"global",	ex_global,
 			RANGE|WHOLEFOLD|BANG|EXTRA|DFLALL|SBOXOK|CMDWIN,
 			ADDR_LINES),
 EX(CMD_goto,		"goto",		ex_goto,
-			RANGE|NOTADR|COUNT|TRLBAR|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR|SBOXOK|CMDWIN,
+			ADDR_OTHER),
 EX(CMD_grep,		"grep",		ex_make,
-			RANGE|NOTADR|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE,
-			ADDR_LINES),
+			RANGE|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE,
+			ADDR_OTHER),
 EX(CMD_grepadd,		"grepadd",	ex_make,
-			RANGE|NOTADR|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE,
-			ADDR_LINES),
+			RANGE|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE,
+			ADDR_OTHER),
 EX(CMD_gui,		"gui",		ex_gui,
 			BANG|FILES|EDITCMD|ARGOPT|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_gvim,		"gvim",		ex_gui,
 			BANG|FILES|EDITCMD|ARGOPT|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_help,		"help",		ex_help,
 			BANG|EXTRA|NOTRLCOM,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_helpclose,	"helpclose",	ex_helpclose,
-			RANGE|NOTADR|COUNT|TRLBAR,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_helpfind,	"helpfind",	ex_helpfind,
 			EXTRA|NOTRLCOM,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_helpgrep,	"helpgrep",	ex_helpgrep,
 			EXTRA|NOTRLCOM|NEEDARG,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_helptags,	"helptags",	ex_helptags,
 			NEEDARG|FILES|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_hardcopy,	"hardcopy",	ex_hardcopy,
 			RANGE|COUNT|EXTRA|TRLBAR|DFLALL|BANG,
 			ADDR_LINES),
 EX(CMD_highlight,	"highlight",	ex_highlight,
 			BANG|EXTRA|TRLBAR|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_hide,		"hide",		ex_hide,
-			BANG|RANGE|NOTADR|COUNT|EXTRA|TRLBAR,
+			BANG|RANGE|COUNT|EXTRA|TRLBAR,
 			ADDR_WINDOWS),
 EX(CMD_history,		"history",	ex_history,
 			EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_insert,		"insert",	ex_append,
 			BANG|RANGE|TRLBAR|CMDWIN|MODIFY,
 			ADDR_LINES),
 EX(CMD_iabbrev,		"iabbrev",	ex_abbreviate,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_iabclear,	"iabclear",	ex_abclear,
 			EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_if,		"if",		ex_if,
 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_ijump,		"ijump",	ex_findpat,
 			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA,
 			ADDR_LINES),
@@ -653,25 +659,25 @@ EX(CMD_ilist,		"ilist",	ex_findpat,
 			ADDR_LINES),
 EX(CMD_imap,		"imap",		ex_map,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_imapclear,	"imapclear",	ex_mapclear,
 			EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_imenu,		"imenu",	ex_menu,
-			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			RANGE|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_OTHER),
 EX(CMD_inoremap,	"inoremap",	ex_map,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_inoreabbrev,	"inoreabbrev",	ex_abbreviate,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_inoremenu,	"inoremenu",	ex_menu,
-			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			RANGE|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_OTHER),
 EX(CMD_intro,		"intro",	ex_intro,
 			TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_isearch,		"isearch",	ex_findpat,
 			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN,
 			ADDR_LINES),
@@ -680,187 +686,187 @@ EX(CMD_isplit,		"isplit",	ex_findpat,
 			ADDR_LINES),
 EX(CMD_iunmap,		"iunmap",	ex_unmap,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_iunabbrev,	"iunabbrev",	ex_abbreviate,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_iunmenu,		"iunmenu",	ex_menu,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_join,		"join",		ex_join,
 			BANG|RANGE|WHOLEFOLD|COUNT|EXFLAGS|TRLBAR|CMDWIN|MODIFY,
 			ADDR_LINES),
 EX(CMD_jumps,		"jumps",	ex_jumps,
 			TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_k,		"k",		ex_mark,
 			RANGE|WORD1|TRLBAR|SBOXOK|CMDWIN,
 			ADDR_LINES),
 EX(CMD_keepmarks,	"keepmarks",	ex_wrongmodifier,
 			NEEDARG|EXTRA|NOTRLCOM,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_keepjumps,	"keepjumps",	ex_wrongmodifier,
 			NEEDARG|EXTRA|NOTRLCOM,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_keeppatterns,	"keeppatterns",	ex_wrongmodifier,
 			NEEDARG|EXTRA|NOTRLCOM,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_keepalt,		"keepalt",	ex_wrongmodifier,
 			NEEDARG|EXTRA|NOTRLCOM,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_list,		"list",		ex_print,
 			RANGE|WHOLEFOLD|COUNT|EXFLAGS|TRLBAR|CMDWIN,
 			ADDR_LINES),
 EX(CMD_lNext,		"lNext",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR|BANG,
+			ADDR_OTHER),
 EX(CMD_lNfile,		"lNfile",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR|BANG,
+			ADDR_OTHER),
 EX(CMD_last,		"last",		ex_last,
 			EXTRA|BANG|EDITCMD|ARGOPT|TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_language,	"language",	ex_language,
 			EXTRA|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_laddexpr,	"laddexpr",	ex_cexpr,
 			NEEDARG|WORD1|NOTRLCOM|TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_laddbuffer,	"laddbuffer",	ex_cbuffer,
-			RANGE|NOTADR|WORD1|TRLBAR,
-			ADDR_LINES),
+			RANGE|WORD1|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_laddfile,	"laddfile",	ex_cfile,
 			TRLBAR|FILE1,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_later,		"later",	ex_later,
 			TRLBAR|EXTRA|NOSPC|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_lbuffer,		"lbuffer",	ex_cbuffer,
-			BANG|RANGE|NOTADR|WORD1|TRLBAR,
-			ADDR_LINES),
+			BANG|RANGE|WORD1|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_lbottom,		"lbottom",	ex_cbottom,
 			TRLBAR,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_lcd,		"lcd",		ex_cd,
 			BANG|FILE1|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_lchdir,		"lchdir",	ex_cd,
 			BANG|FILE1|TRLBAR|CMDWIN,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_lclose,		"lclose",	ex_cclose,
-			RANGE|NOTADR|COUNT|TRLBAR,
-			ADDR_LINES),
+			RANGE|COUNT|TRLBAR,
+			ADDR_OTHER),
 EX(CMD_lcscope,		"lcscope",	ex_cscope,
 			EXTRA|NOTRLCOM|XFILE,
-			ADDR_LINES),
+			ADDR_NONE),
 EX(CMD_ldo,		"ldo",		ex_listdo,
-			BANG|NEEDARG|EXTRA|NOTRLCOM|RANGE|NOTADR|DFLALL,
+			BANG|NEEDARG|EXTRA|NOTRLCOM|RANGE|DFLALL,
 			ADDR_QUICKFIX),
 EX(CMD_left,		"left",		ex_align,
 			TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY,
 			ADDR_LIN