updated for version 7.4.530v7.4.530

Problem:    Many commands take a count or range that is not using line
            numbers.
Solution:   For each command specify what kind of count it uses.  For windows,
            buffers and arguments have "$" and "." have a relevant meaning.
            (Marcin Szamotulski)

11 files changed, 1562 insertions, 672 deletions

diff --git a/src/Makefile b/src/Makefile
index 6bf8c1737d..13fe70b1ad 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1890,10 +1890,12 @@ unittest unittests: $(UNITTEST_TARGETS)
 	done
 
 # Run individual test, assuming that Vim was already compiled.
-test1 test2 test3 test4 test5 test6 test7 test8 test9 \
+test1 \
+	test_argument_count \
 	test_autoformat_join \
 	test_breakindent \
 	test_changelist \
+	test_close_count \
 	test_eval \
 	test_insertcount \
 	test_listlbr \
@@ -1904,6 +1906,7 @@ test1 test2 test3 test4 test5 test6 test7 test8 test9 \
 	test_signs \
 	test_utf8 \
 	test_writefile \
+	test2 test3 test4 test5 test6 test7 test8 test9 \
 	test10 test11 test12 test13 test14 test15 test16 test17 test18 test19 \
 	test20 test21 test22 test23 test24 test25 test26 test27 test28 test29 \
 	test30 test31 test32 test33 test34 test35 test36 test37 test38 test39 \
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 93c77764a0..5574ea7bc2 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -58,6 +58,14 @@
 #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
+#define ADDR_WINDOWS		1
+#define ADDR_ARGUMENTS		2
+#define ADDR_LOADED_BUFFERS	3
+#define ADDR_UNLOADED_BUFFERS	4
+#define ADDR_TABS		5
+
 #ifndef DO_DECLARE_EXCMD
 typedef struct exarg exarg_T;
 #endif
@@ -74,7 +82,7 @@ typedef struct exarg exarg_T;
 # undef EX	    /* just in case */
 #endif
 #ifdef DO_DECLARE_EXCMD
-# define EX(a, b, c, d)  {(char_u *)b, c, (long_u)(d)}
+# define EX(a, b, c, d, e)  {(char_u *)b, c, (long_u)(d), e}
 
 typedef void (*ex_func_T) __ARGS((exarg_T *eap));
 
@@ -83,1064 +91,1588 @@ 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 */
 }
 # if defined(FEAT_GUI_W16)
 _far
 # endif
 cmdnames[] =
 #else
-# define EX(a, b, c, d)  a
+# define EX(a, b, c, d, e)  a
 enum CMD_index
 #endif
 {
 EX(CMD_append,		"append",	ex_append,
-			BANG|RANGE|ZEROR|TRLBAR|CMDWIN|MODIFY),
+			BANG|RANGE|ZEROR|TRLBAR|CMDWIN|MODIFY,
+			ADDR_LINES),
 EX(CMD_abbreviate,	"abbreviate",	ex_abbreviate,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_abclear,		"abclear",	ex_abclear,
-			EXTRA|TRLBAR|CMDWIN),
+			EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_aboveleft,	"aboveleft",	ex_wrongmodifier,
-			NEEDARG|EXTRA|NOTRLCOM),
+			NEEDARG|EXTRA|NOTRLCOM,
+			ADDR_LINES),
 EX(CMD_all,		"all",		ex_all,
-			BANG|RANGE|NOTADR|COUNT|TRLBAR),
+			BANG|RANGE|NOTADR|COUNT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_amenu,		"amenu",	ex_menu,
-			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_anoremenu,	"anoremenu",	ex_menu,
-			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_args,		"args",		ex_args,
-			BANG|FILES|EDITCMD|ARGOPT|TRLBAR),
+			BANG|FILES|EDITCMD|ARGOPT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_argadd,		"argadd",	ex_argadd,
-			BANG|NEEDARG|RANGE|NOTADR|ZEROR|FILES|TRLBAR),
+			BANG|NEEDARG|RANGE|NOTADR|ZEROR|FILES|TRLBAR,
+			ADDR_ARGUMENTS),
 EX(CMD_argdelete,	"argdelete",	ex_argdelete,
-			BANG|RANGE|NOTADR|FILES|TRLBAR),
+			BANG|RANGE|NOTADR|FILES|TRLBAR,
+			ADDR_ARGUMENTS),
 EX(CMD_argdo,		"argdo",	ex_listdo,
-			BANG|NEEDARG|EXTRA|NOTRLCOM),
+			BANG|NEEDARG|EXTRA|NOTRLCOM,
+			ADDR_LINES),
 EX(CMD_argedit,		"argedit",	ex_argedit,
-			BANG|NEEDARG|RANGE|NOTADR|FILE1|EDITCMD|ARGOPT|TRLBAR),
+			BANG|NEEDARG|RANGE|NOTADR|FILE1|EDITCMD|ARGOPT|TRLBAR,
+			ADDR_ARGUMENTS),
 EX(CMD_argglobal,	"argglobal",	ex_args,
-			BANG|FILES|EDITCMD|ARGOPT|TRLBAR),
+			BANG|FILES|EDITCMD|ARGOPT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_arglocal,	"arglocal",	ex_args,
-			BANG|FILES|EDITCMD|ARGOPT|TRLBAR),
+			BANG|FILES|EDITCMD|ARGOPT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_argument,	"argument",	ex_argument,
-			BANG|RANGE|NOTADR|COUNT|EXTRA|EDITCMD|ARGOPT|TRLBAR),
+			BANG|RANGE|NOTADR|COUNT|EXTRA|EDITCMD|ARGOPT|TRLBAR,
+			ADDR_ARGUMENTS),
 EX(CMD_ascii,		"ascii",	do_ascii,
-			TRLBAR|SBOXOK|CMDWIN),
+			TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_autocmd,		"autocmd",	ex_autocmd,
-			BANG|EXTRA|NOTRLCOM|USECTRLV|CMDWIN),
+			BANG|EXTRA|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_augroup,		"augroup",	ex_autocmd,
-			BANG|WORD1|TRLBAR|CMDWIN),
+			BANG|WORD1|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_aunmenu,		"aunmenu",	ex_menu,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_buffer,		"buffer",	ex_buffer,
-			BANG|RANGE|NOTADR|BUFNAME|BUFUNL|COUNT|EXTRA|EDITCMD|TRLBAR),
+			BANG|RANGE|NOTADR|BUFNAME|BUFUNL|COUNT|EXTRA|EDITCMD|TRLBAR,
+			ADDR_UNLOADED_BUFFERS),
 EX(CMD_bNext,		"bNext",	ex_bprevious,
-			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR),
+			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR,
+			ADDR_LINES),
 EX(CMD_ball,		"ball",		ex_buffer_all,
-			RANGE|NOTADR|COUNT|TRLBAR),
+			RANGE|NOTADR|COUNT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_badd,		"badd",		ex_edit,
-			NEEDARG|FILE1|EDITCMD|TRLBAR|CMDWIN),
+			NEEDARG|FILE1|EDITCMD|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_bdelete,		"bdelete",	ex_bunload,
-			BANG|RANGE|NOTADR|BUFNAME|COUNT|EXTRA|TRLBAR),
+			BANG|RANGE|NOTADR|BUFNAME|COUNT|EXTRA|TRLBAR,
+			ADDR_LOADED_BUFFERS),
 EX(CMD_behave,		"behave",	ex_behave,
-			NEEDARG|WORD1|TRLBAR|CMDWIN),
+			NEEDARG|WORD1|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_belowright,	"belowright",	ex_wrongmodifier,
-			NEEDARG|EXTRA|NOTRLCOM),
+			NEEDARG|EXTRA|NOTRLCOM,
+			ADDR_LINES),
 EX(CMD_bfirst,		"bfirst",	ex_brewind,
-			BANG|RANGE|NOTADR|EDITCMD|TRLBAR),
+			BANG|RANGE|NOTADR|EDITCMD|TRLBAR,
+			ADDR_LINES),
 EX(CMD_blast,		"blast",	ex_blast,
-			BANG|RANGE|NOTADR|EDITCMD|TRLBAR),
+			BANG|RANGE|NOTADR|EDITCMD|TRLBAR,
+			ADDR_LINES),
 EX(CMD_bmodified,	"bmodified",	ex_bmodified,
-			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR),
+			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR,
+			ADDR_LINES),
 EX(CMD_bnext,		"bnext",	ex_bnext,
-			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR),
+			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR,
+			ADDR_LINES),
 EX(CMD_botright,	"botright",	ex_wrongmodifier,
-			NEEDARG|EXTRA|NOTRLCOM),
+			NEEDARG|EXTRA|NOTRLCOM,
+			ADDR_LINES),
 EX(CMD_bprevious,	"bprevious",	ex_bprevious,
-			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR),
+			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR,
+			ADDR_LINES),
 EX(CMD_brewind,		"brewind",	ex_brewind,
-			BANG|RANGE|NOTADR|EDITCMD|TRLBAR),
+			BANG|RANGE|NOTADR|EDITCMD|TRLBAR,
+			ADDR_LINES),
 EX(CMD_break,		"break",	ex_break,
-			TRLBAR|SBOXOK|CMDWIN),
+			TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_breakadd,	"breakadd",	ex_breakadd,
-			EXTRA|TRLBAR|CMDWIN),
+			EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_breakdel,	"breakdel",	ex_breakdel,
-			EXTRA|TRLBAR|CMDWIN),
+			EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_breaklist,	"breaklist",	ex_breaklist,
-			EXTRA|TRLBAR|CMDWIN),
+			EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_browse,		"browse",	ex_wrongmodifier,
-			NEEDARG|EXTRA|NOTRLCOM|CMDWIN),
+			NEEDARG|EXTRA|NOTRLCOM|CMDWIN,
+			ADDR_LINES),
 EX(CMD_buffers,		"buffers",	buflist_list,
-			BANG|TRLBAR|CMDWIN),
+			BANG|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_bufdo,		"bufdo",	ex_listdo,
-			BANG|NEEDARG|EXTRA|NOTRLCOM),
+			BANG|NEEDARG|EXTRA|NOTRLCOM,
+			ADDR_LINES),
 EX(CMD_bunload,		"bunload",	ex_bunload,
-			BANG|RANGE|NOTADR|BUFNAME|COUNT|EXTRA|TRLBAR),
+			BANG|RANGE|NOTADR|BUFNAME|COUNT|EXTRA|TRLBAR,
+			ADDR_LOADED_BUFFERS),
 EX(CMD_bwipeout,	"bwipeout",	ex_bunload,
-			BANG|RANGE|NOTADR|BUFNAME|BUFUNL|COUNT|EXTRA|TRLBAR),
+			BANG|RANGE|NOTADR|BUFNAME|BUFUNL|COUNT|EXTRA|TRLBAR,
+			ADDR_UNLOADED_BUFFERS),
 EX(CMD_change,		"change",	ex_change,
-			BANG|WHOLEFOLD|RANGE|COUNT|TRLBAR|CMDWIN|MODIFY),
+			BANG|WHOLEFOLD|RANGE|COUNT|TRLBAR|CMDWIN|MODIFY,
+			ADDR_LINES),
 EX(CMD_cNext,		"cNext",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_cNfile,		"cNfile",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_cabbrev,		"cabbrev",	ex_abbreviate,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_cabclear,	"cabclear",	ex_abclear,
-			EXTRA|TRLBAR|CMDWIN),
+			EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_caddbuffer,	"caddbuffer",	ex_cbuffer,
-			RANGE|NOTADR|WORD1|TRLBAR),
+			RANGE|NOTADR|WORD1|TRLBAR,
+			ADDR_LINES),
 EX(CMD_caddexpr,	"caddexpr",	ex_cexpr,
-			NEEDARG|WORD1|NOTRLCOM|TRLBAR),
+			NEEDARG|WORD1|NOTRLCOM|TRLBAR,
+			ADDR_LINES),
 EX(CMD_caddfile,	"caddfile",	ex_cfile,
-			TRLBAR|FILE1),
+			TRLBAR|FILE1,
+			ADDR_LINES),
 EX(CMD_call,		"call",		ex_call,
-			RANGE|NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
+			RANGE|NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_catch,		"catch",	ex_catch,
-			EXTRA|SBOXOK|CMDWIN),
+			EXTRA|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_cbuffer,		"cbuffer",	ex_cbuffer,
-			BANG|RANGE|NOTADR|WORD1|TRLBAR),
+			BANG|RANGE|NOTADR|WORD1|TRLBAR,
+			ADDR_LINES),
 EX(CMD_cc,		"cc",		ex_cc,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_cclose,		"cclose",	ex_cclose,
-			RANGE|NOTADR|COUNT|TRLBAR),
+			RANGE|NOTADR|COUNT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_cd,		"cd",		ex_cd,
-			BANG|FILE1|TRLBAR|CMDWIN),
+			BANG|FILE1|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_center,		"center",	ex_align,
-			TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY),
+			TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY,
+			ADDR_LINES),
 EX(CMD_cexpr,		"cexpr",	ex_cexpr,
-			NEEDARG|WORD1|NOTRLCOM|TRLBAR|BANG),
+			NEEDARG|WORD1|NOTRLCOM|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_cfile,		"cfile",	ex_cfile,
-			TRLBAR|FILE1|BANG),
+			TRLBAR|FILE1|BANG,
+			ADDR_LINES),
 EX(CMD_cfirst,		"cfirst",	ex_cc,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_cgetfile,	"cgetfile",	ex_cfile,
-			TRLBAR|FILE1),
+			TRLBAR|FILE1,
+			ADDR_LINES),
 EX(CMD_cgetbuffer,	"cgetbuffer",	ex_cbuffer,
-			RANGE|NOTADR|WORD1|TRLBAR),
+			RANGE|NOTADR|WORD1|TRLBAR,
+			ADDR_LINES),
 EX(CMD_cgetexpr,	"cgetexpr",	ex_cexpr,
-			NEEDARG|WORD1|NOTRLCOM|TRLBAR),
+			NEEDARG|WORD1|NOTRLCOM|TRLBAR,
+			ADDR_LINES),
 EX(CMD_chdir,		"chdir",	ex_cd,
-			BANG|FILE1|TRLBAR|CMDWIN),
+			BANG|FILE1|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_changes,		"changes",	ex_changes,
-			TRLBAR|CMDWIN),
+			TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_checkpath,	"checkpath",	ex_checkpath,
-			TRLBAR|BANG|CMDWIN),
+			TRLBAR|BANG|CMDWIN,
+			ADDR_LINES),
 EX(CMD_checktime,	"checktime",	ex_checktime,
-			RANGE|NOTADR|BUFNAME|COUNT|EXTRA|TRLBAR),
+			RANGE|NOTADR|BUFNAME|COUNT|EXTRA|TRLBAR,
+			ADDR_LINES),
 EX(CMD_clist,		"clist",	qf_list,
-			BANG|EXTRA|TRLBAR|CMDWIN),
+			BANG|EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_clast,		"clast",	ex_cc,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_close,		"close",	ex_close,
-			BANG|TRLBAR|CMDWIN),
+			BANG|RANGE|NOTADR|COUNT|TRLBAR|CMDWIN,
+			ADDR_WINDOWS),
 EX(CMD_cmap,		"cmap",		ex_map,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_cmapclear,	"cmapclear",	ex_mapclear,
-			EXTRA|TRLBAR|CMDWIN),
+			EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_cmenu,		"cmenu",	ex_menu,
-			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_cnext,		"cnext",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_cnewer,		"cnewer",	qf_age,
-			RANGE|NOTADR|COUNT|TRLBAR),
+			RANGE|NOTADR|COUNT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_cnfile,		"cnfile",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_cnoremap,	"cnoremap",	ex_map,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_cnoreabbrev,	"cnoreabbrev",	ex_abbreviate,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_cnoremenu,	"cnoremenu",	ex_menu,
-			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_copy,		"copy",		ex_copymove,
-			RANGE|WHOLEFOLD|EXTRA|TRLBAR|CMDWIN|MODIFY),
+			RANGE|WHOLEFOLD|EXTRA|TRLBAR|CMDWIN|MODIFY,
+			ADDR_LINES),
 EX(CMD_colder,		"colder",	qf_age,
-			RANGE|NOTADR|COUNT|TRLBAR),
+			RANGE|NOTADR|COUNT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_colorscheme,	"colorscheme",	ex_colorscheme,
-			WORD1|TRLBAR|CMDWIN),
+			WORD1|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_command,		"command",	ex_command,
-			EXTRA|BANG|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|BANG|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_comclear,	"comclear",	ex_comclear,
-			TRLBAR|CMDWIN),
+			TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_compiler,	"compiler",	ex_compiler,
-			BANG|TRLBAR|WORD1|CMDWIN),
+			BANG|TRLBAR|WORD1|CMDWIN,
+			ADDR_LINES),
 EX(CMD_continue,	"continue",	ex_continue,
-			TRLBAR|SBOXOK|CMDWIN),
+			TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_confirm,		"confirm",	ex_wrongmodifier,
-			NEEDARG|EXTRA|NOTRLCOM|CMDWIN),
+			NEEDARG|EXTRA|NOTRLCOM|CMDWIN,
+			ADDR_LINES),
 EX(CMD_copen,		"copen",	ex_copen,
-			RANGE|NOTADR|COUNT|TRLBAR),
+			RANGE|NOTADR|COUNT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_cprevious,	"cprevious",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_cpfile,		"cpfile",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_cquit,		"cquit",	ex_cquit,
-			TRLBAR|BANG),
+			TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_crewind,		"crewind",	ex_cc,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_cscope,		"cscope",	do_cscope,
-			EXTRA|NOTRLCOM|XFILE),
+			EXTRA|NOTRLCOM|XFILE,
+			ADDR_LINES),
 EX(CMD_cstag,		"cstag",	do_cstag,
-			BANG|TRLBAR|WORD1),
+			BANG|TRLBAR|WORD1,
+			ADDR_LINES),
 EX(CMD_cunmap,		"cunmap",	ex_unmap,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_cunabbrev,	"cunabbrev",	ex_abbreviate,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_cunmenu,		"cunmenu",	ex_menu,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_cwindow,		"cwindow",	ex_cwindow,
-			RANGE|NOTADR|COUNT|TRLBAR),
+			RANGE|NOTADR|COUNT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_delete,		"delete",	ex_operators,
-			RANGE|WHOLEFOLD|REGSTR|COUNT|TRLBAR|CMDWIN|MODIFY),
+			RANGE|WHOLEFOLD|REGSTR|COUNT|TRLBAR|CMDWIN|MODIFY,
+			ADDR_LINES),
 EX(CMD_delmarks,	"delmarks",	ex_delmarks,
-			BANG|EXTRA|TRLBAR|CMDWIN),
+			BANG|EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_debug,		"debug",	ex_debug,
-			NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
+			NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_debuggreedy,	"debuggreedy",	ex_debuggreedy,
-			RANGE|NOTADR|ZEROR|TRLBAR|CMDWIN),
+			RANGE|NOTADR|ZEROR|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_delcommand,	"delcommand",	ex_delcommand,
-			NEEDARG|WORD1|TRLBAR|CMDWIN),
+			NEEDARG|WORD1|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_delfunction,	"delfunction",	ex_delfunction,
-			NEEDARG|WORD1|CMDWIN),
+			NEEDARG|WORD1|CMDWIN,
+			ADDR_LINES),
 EX(CMD_display,		"display",	ex_display,
-			EXTRA|NOTRLCOM|TRLBAR|SBOXOK|CMDWIN),
+			EXTRA|NOTRLCOM|TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_diffupdate,	"diffupdate",	ex_diffupdate,
-			BANG|TRLBAR),
+			BANG|TRLBAR,
+			ADDR_LINES),
 EX(CMD_diffget,		"diffget",	ex_diffgetput,
-			RANGE|EXTRA|TRLBAR|MODIFY),
+			RANGE|EXTRA|TRLBAR|MODIFY,
+			ADDR_LINES),
 EX(CMD_diffoff,		"diffoff",	ex_diffoff,
-			BANG|TRLBAR),
+			BANG|TRLBAR,
+			ADDR_LINES),
 EX(CMD_diffpatch,	"diffpatch",	ex_diffpatch,
-			EXTRA|FILE1|TRLBAR|MODIFY),
+			EXTRA|FILE1|TRLBAR|MODIFY,
+			ADDR_LINES),
 EX(CMD_diffput,		"diffput",	ex_diffgetput,
-			RANGE|EXTRA|TRLBAR),
+			RANGE|EXTRA|TRLBAR,
+			ADDR_LINES),
 EX(CMD_diffsplit,	"diffsplit",	ex_diffsplit,
-			EXTRA|FILE1|TRLBAR),
+			EXTRA|FILE1|TRLBAR,
+			ADDR_LINES),
 EX(CMD_diffthis,	"diffthis",	ex_diffthis,
-			TRLBAR),
+			TRLBAR,
+			ADDR_LINES),
 EX(CMD_digraphs,	"digraphs",	ex_digraphs,
-			EXTRA|TRLBAR|CMDWIN),
+			EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_djump,		"djump",	ex_findpat,
-			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA),
+			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA,
+			ADDR_LINES),
 EX(CMD_dlist,		"dlist",	ex_findpat,
-			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN),
+			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN,
+			ADDR_LINES),
 EX(CMD_doautocmd,	"doautocmd",	ex_doautocmd,
-			EXTRA|TRLBAR|CMDWIN),
+			EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_doautoall,	"doautoall",	ex_doautoall,
-			EXTRA|TRLBAR|CMDWIN),
+			EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_drop,		"drop",		ex_drop,
-			FILES|EDITCMD|NEEDARG|ARGOPT|TRLBAR),
+			FILES|EDITCMD|NEEDARG|ARGOPT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_dsearch,		"dsearch",	ex_findpat,
-			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN),
+			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN,
+			ADDR_LINES),
 EX(CMD_dsplit,		"dsplit",	ex_findpat,
-			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA),
+			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA,
+			ADDR_LINES),
 EX(CMD_edit,		"edit",		ex_edit,
-			BANG|FILE1|EDITCMD|ARGOPT|TRLBAR),
+			BANG|FILE1|EDITCMD|ARGOPT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_earlier,		"earlier",	ex_later,
-			TRLBAR|EXTRA|NOSPC|CMDWIN),
+			TRLBAR|EXTRA|NOSPC|CMDWIN,
+			ADDR_LINES),
 EX(CMD_echo,		"echo",		ex_echo,
-			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
+			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_echoerr,		"echoerr",	ex_execute,
-			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
+			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_echohl,		"echohl",	ex_echohl,
-			EXTRA|TRLBAR|SBOXOK|CMDWIN),
+			EXTRA|TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_echomsg,		"echomsg",	ex_execute,
-			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
+			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_echon,		"echon",	ex_echo,
-			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
+			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_else,		"else",		ex_else,
-			TRLBAR|SBOXOK|CMDWIN),
+			TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_elseif,		"elseif",	ex_else,
-			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
+			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_emenu,		"emenu",	ex_emenu,
-			NEEDARG|EXTRA|TRLBAR|NOTRLCOM|RANGE|NOTADR|CMDWIN),
+			NEEDARG|EXTRA|TRLBAR|NOTRLCOM|RANGE|NOTADR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_endif,		"endif",	ex_endif,
-			TRLBAR|SBOXOK|CMDWIN),
+			TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_endfunction,	"endfunction",	ex_endfunction,
-			TRLBAR|CMDWIN),
+			TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_endfor,		"endfor",	ex_endwhile,
-			TRLBAR|SBOXOK|CMDWIN),
+			TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_endtry,		"endtry",	ex_endtry,
-			TRLBAR|SBOXOK|CMDWIN),
+			TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_endwhile,	"endwhile",	ex_endwhile,
-			TRLBAR|SBOXOK|CMDWIN),
+			TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_enew,		"enew",		ex_edit,
-			BANG|TRLBAR),
+			BANG|TRLBAR,
+			ADDR_LINES),
 EX(CMD_ex,		"ex",		ex_edit,
-			BANG|FILE1|EDITCMD|ARGOPT|TRLBAR),
+			BANG|FILE1|EDITCMD|ARGOPT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_execute,		"execute",	ex_execute,
-			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
+			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_exit,		"exit",		ex_exit,
-			RANGE|WHOLEFOLD|BANG|FILE1|ARGOPT|DFLALL|TRLBAR|CMDWIN),
+			RANGE|WHOLEFOLD|BANG|FILE1|ARGOPT|DFLALL|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_exusage,		"exusage",	ex_exusage,
-			TRLBAR),
+			TRLBAR,
+			ADDR_LINES),
 EX(CMD_file,		"file",		ex_file,
-			RANGE|NOTADR|ZEROR|BANG|FILE1|TRLBAR),
+			RANGE|NOTADR|ZEROR|BANG|FILE1|TRLBAR,
+			ADDR_LINES),
 EX(CMD_files,		"files",	buflist_list,
-			BANG|TRLBAR|CMDWIN),
+			BANG|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_filetype,	"filetype",	ex_filetype,
-			EXTRA|TRLBAR|CMDWIN),
+			EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_find,		"find",		ex_find,
-			RANGE|NOTADR|BANG|FILE1|EDITCMD|ARGOPT|TRLBAR),
+			RANGE|NOTADR|BANG|FILE1|EDITCMD|ARGOPT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_finally,		"finally",	ex_finally,
-			TRLBAR|SBOXOK|CMDWIN),
+			TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_finish,		"finish",	ex_finish,
-			TRLBAR|SBOXOK|CMDWIN),
+			TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_first,		"first",	ex_rewind,
-			EXTRA|BANG|EDITCMD|ARGOPT|TRLBAR),
+			EXTRA|BANG|EDITCMD|ARGOPT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_fixdel,		"fixdel",	do_fixdel,
-			TRLBAR|CMDWIN),
+			TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_fold,		"fold",		ex_fold,
-			RANGE|WHOLEFOLD|TRLBAR|SBOXOK|CMDWIN),
+			RANGE|WHOLEFOLD|TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_foldclose,	"foldclose",	ex_foldopen,
-			RANGE|BANG|WHOLEFOLD|TRLBAR|SBOXOK|CMDWIN),
+			RANGE|BANG|WHOLEFOLD|TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_folddoopen,	"folddoopen",	ex_folddo,
-			RANGE|DFLALL|NEEDARG|EXTRA|NOTRLCOM),
+			RANGE|DFLALL|NEEDARG|EXTRA|NOTRLCOM,
+			ADDR_LINES),
 EX(CMD_folddoclosed,	"folddoclosed",	ex_folddo,
-			RANGE|DFLALL|NEEDARG|EXTRA|NOTRLCOM),
+			RANGE|DFLALL|NEEDARG|EXTRA|NOTRLCOM,
+			ADDR_LINES),
 EX(CMD_foldopen,	"foldopen",	ex_foldopen,
-			RANGE|BANG|WHOLEFOLD|TRLBAR|SBOXOK|CMDWIN),
+			RANGE|BANG|WHOLEFOLD|TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_for,		"for",		ex_while,
-			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
+			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_function,	"function",	ex_function,
-			EXTRA|BANG|CMDWIN),
+			EXTRA|BANG|CMDWIN,
+			ADDR_LINES),
 EX(CMD_global,		"global",	ex_global,
-			RANGE|WHOLEFOLD|BANG|EXTRA|DFLALL|SBOXOK|CMDWIN),
+			RANGE|WHOLEFOLD|BANG|EXTRA|DFLALL|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_goto,		"goto",		ex_goto,
-			RANGE|NOTADR|COUNT|TRLBAR|SBOXOK|CMDWIN),
+			RANGE|NOTADR|COUNT|TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_grep,		"grep",		ex_make,
-			RANGE|NOTADR|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE),
+			RANGE|NOTADR|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE,
+			ADDR_LINES),
 EX(CMD_grepadd,		"grepadd",	ex_make,
-			RANGE|NOTADR|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE),
+			RANGE|NOTADR|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE,
+			ADDR_LINES),
 EX(CMD_gui,		"gui",		ex_gui,
-			BANG|FILES|EDITCMD|ARGOPT|TRLBAR|CMDWIN),
+			BANG|FILES|EDITCMD|ARGOPT|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_gvim,		"gvim",		ex_gui,
-			BANG|FILES|EDITCMD|ARGOPT|TRLBAR|CMDWIN),
+			BANG|FILES|EDITCMD|ARGOPT|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_help,		"help",		ex_help,
-			BANG|EXTRA|NOTRLCOM),
+			BANG|EXTRA|NOTRLCOM,
+			ADDR_LINES),
 EX(CMD_helpclose,	"helpclose",	ex_helpclose,
-			RANGE|NOTADR|COUNT|TRLBAR),
+			RANGE|NOTADR|COUNT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_helpfind,	"helpfind",	ex_helpfind,
-			EXTRA|NOTRLCOM),
+			EXTRA|NOTRLCOM,
+			ADDR_LINES),
 EX(CMD_helpgrep,	"helpgrep",	ex_helpgrep,
-			EXTRA|NOTRLCOM|NEEDARG),
+			EXTRA|NOTRLCOM|NEEDARG,
+			ADDR_LINES),
 EX(CMD_helptags,	"helptags",	ex_helptags,
-			NEEDARG|FILES|TRLBAR|CMDWIN),
+			NEEDARG|FILES|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_hardcopy,	"hardcopy",	ex_hardcopy,
-			RANGE|COUNT|EXTRA|TRLBAR|DFLALL|BANG),
+			RANGE|COUNT|EXTRA|TRLBAR|DFLALL|BANG,
+			ADDR_LINES),
 EX(CMD_highlight,	"highlight",	ex_highlight,
-			BANG|EXTRA|TRLBAR|SBOXOK|CMDWIN),
+			BANG|EXTRA|TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_hide,		"hide",		ex_hide,
-			BANG|EXTRA|NOTRLCOM),
+			BANG|RANGE|NOTADR|COUNT|EXTRA|NOTRLCOM,
+			ADDR_WINDOWS),
 EX(CMD_history,		"history",	ex_history,
-			EXTRA|TRLBAR|CMDWIN),
+			EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_insert,		"insert",	ex_append,
-			BANG|RANGE|TRLBAR|CMDWIN|MODIFY),
+			BANG|RANGE|TRLBAR|CMDWIN|MODIFY,
+			ADDR_LINES),
 EX(CMD_iabbrev,		"iabbrev",	ex_abbreviate,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_iabclear,	"iabclear",	ex_abclear,
-			EXTRA|TRLBAR|CMDWIN),
+			EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_if,		"if",		ex_if,
-			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
+			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_ijump,		"ijump",	ex_findpat,
-			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA),
+			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA,
+			ADDR_LINES),
 EX(CMD_ilist,		"ilist",	ex_findpat,
-			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN),
+			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN,
+			ADDR_LINES),
 EX(CMD_imap,		"imap",		ex_map,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_imapclear,	"imapclear",	ex_mapclear,
-			EXTRA|TRLBAR|CMDWIN),
+			EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_imenu,		"imenu",	ex_menu,
-			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_inoremap,	"inoremap",	ex_map,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_inoreabbrev,	"inoreabbrev",	ex_abbreviate,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_inoremenu,	"inoremenu",	ex_menu,
-			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_intro,		"intro",	ex_intro,
-			TRLBAR|CMDWIN),
+			TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_isearch,		"isearch",	ex_findpat,
-			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN),
+			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN,
+			ADDR_LINES),
 EX(CMD_isplit,		"isplit",	ex_findpat,
-			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA),
+			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA,
+			ADDR_LINES),
 EX(CMD_iunmap,		"iunmap",	ex_unmap,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_iunabbrev,	"iunabbrev",	ex_abbreviate,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_iunmenu,		"iunmenu",	ex_menu,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_join,		"join",		ex_join,
-			BANG|RANGE|WHOLEFOLD|COUNT|EXFLAGS|TRLBAR|CMDWIN|MODIFY),
+			BANG|RANGE|WHOLEFOLD|COUNT|EXFLAGS|TRLBAR|CMDWIN|MODIFY,
+			ADDR_LINES),
 EX(CMD_jumps,		"jumps",	ex_jumps,
-			TRLBAR|CMDWIN),
+			TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_k,		"k",		ex_mark,
-			RANGE|WORD1|TRLBAR|SBOXOK|CMDWIN),
+			RANGE|WORD1|TRLBAR|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_keepmarks,	"keepmarks",	ex_wrongmodifier,
-			NEEDARG|EXTRA|NOTRLCOM),
+			NEEDARG|EXTRA|NOTRLCOM,
+			ADDR_LINES),
 EX(CMD_keepjumps,	"keepjumps",	ex_wrongmodifier,
-			NEEDARG|EXTRA|NOTRLCOM),
+			NEEDARG|EXTRA|NOTRLCOM,
+			ADDR_LINES),
 EX(CMD_keeppatterns,	"keeppatterns",	ex_wrongmodifier,
-			NEEDARG|EXTRA|NOTRLCOM),
+			NEEDARG|EXTRA|NOTRLCOM,
+			ADDR_LINES),
 EX(CMD_keepalt,		"keepalt",	ex_wrongmodifier,
-			NEEDARG|EXTRA|NOTRLCOM),
+			NEEDARG|EXTRA|NOTRLCOM,
+			ADDR_LINES),
 EX(CMD_list,		"list",		ex_print,
-			RANGE|WHOLEFOLD|COUNT|EXFLAGS|TRLBAR|CMDWIN),
+			RANGE|WHOLEFOLD|COUNT|EXFLAGS|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_lNext,		"lNext",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_lNfile,		"lNfile",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_last,		"last",		ex_last,
-			EXTRA|BANG|EDITCMD|ARGOPT|TRLBAR),
+			EXTRA|BANG|EDITCMD|ARGOPT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_language,	"language",	ex_language,
-			EXTRA|TRLBAR|CMDWIN),
+			EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_laddexpr,	"laddexpr",	ex_cexpr,
-			NEEDARG|WORD1|NOTRLCOM|TRLBAR),
+			NEEDARG|WORD1|NOTRLCOM|TRLBAR,
+			ADDR_LINES),
 EX(CMD_laddbuffer,	"laddbuffer",	ex_cbuffer,
-			RANGE|NOTADR|WORD1|TRLBAR),
+			RANGE|NOTADR|WORD1|TRLBAR,
+			ADDR_LINES),
 EX(CMD_laddfile,	"laddfile",	ex_cfile,
-			TRLBAR|FILE1),
+			TRLBAR|FILE1,
+			ADDR_LINES),
 EX(CMD_later,		"later",	ex_later,
-			TRLBAR|EXTRA|NOSPC|CMDWIN),
+			TRLBAR|EXTRA|NOSPC|CMDWIN,
+			ADDR_LINES),
 EX(CMD_lbuffer,		"lbuffer",	ex_cbuffer,
-			BANG|RANGE|NOTADR|WORD1|TRLBAR),
+			BANG|RANGE|NOTADR|WORD1|TRLBAR,
+			ADDR_LINES),
 EX(CMD_lcd,		"lcd",		ex_cd,
-			BANG|FILE1|TRLBAR|CMDWIN),
+			BANG|FILE1|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_lchdir,		"lchdir",	ex_cd,
-			BANG|FILE1|TRLBAR|CMDWIN),
+			BANG|FILE1|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_lclose,		"lclose",	ex_cclose,
-			RANGE|NOTADR|COUNT|TRLBAR),
+			RANGE|NOTADR|COUNT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_lcscope,		"lcscope",	do_cscope,
-			EXTRA|NOTRLCOM|XFILE),
+			EXTRA|NOTRLCOM|XFILE,
+			ADDR_LINES),
 EX(CMD_left,		"left",		ex_align,
-			TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY),
+			TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY,
+			ADDR_LINES),
 EX(CMD_leftabove,	"leftabove",	ex_wrongmodifier,
-			NEEDARG|EXTRA|NOTRLCOM),
+			NEEDARG|EXTRA|NOTRLCOM,
+			ADDR_LINES),
 EX(CMD_let,		"let",		ex_let,
-			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
+			EXTRA|NOTRLCOM|SBOXOK|CMDWIN,
+			ADDR_LINES),
 EX(CMD_lexpr,		"lexpr",	ex_cexpr,
-			NEEDARG|WORD1|NOTRLCOM|TRLBAR|BANG),
+			NEEDARG|WORD1|NOTRLCOM|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_lfile,		"lfile",	ex_cfile,
-			TRLBAR|FILE1|BANG),
+			TRLBAR|FILE1|BANG,
+			ADDR_LINES),
 EX(CMD_lfirst,		"lfirst",	ex_cc,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_lgetfile,	"lgetfile",	ex_cfile,
-			TRLBAR|FILE1),
+			TRLBAR|FILE1,
+			ADDR_LINES),
 EX(CMD_lgetbuffer,	"lgetbuffer",	ex_cbuffer,
-			RANGE|NOTADR|WORD1|TRLBAR),
+			RANGE|NOTADR|WORD1|TRLBAR,
+			ADDR_LINES),
 EX(CMD_lgetexpr,	"lgetexpr",	ex_cexpr,
-			NEEDARG|WORD1|NOTRLCOM|TRLBAR),
+			NEEDARG|WORD1|NOTRLCOM|TRLBAR,
+			ADDR_LINES),
 EX(CMD_lgrep,		"lgrep",	ex_make,
-			RANGE|NOTADR|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE),
+			RANGE|NOTADR|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE,
+			ADDR_LINES),
 EX(CMD_lgrepadd,	"lgrepadd",	ex_make,
-			RANGE|NOTADR|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE),
+			RANGE|NOTADR|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE,
+			ADDR_LINES),
 EX(CMD_lhelpgrep,	"lhelpgrep",	ex_helpgrep,
-			EXTRA|NOTRLCOM|NEEDARG),
+			EXTRA|NOTRLCOM|NEEDARG,
+			ADDR_LINES),
 EX(CMD_ll,		"ll",		ex_cc,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_llast,		"llast",	ex_cc,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_llist,		"llist",	qf_list,
-			BANG|EXTRA|TRLBAR|CMDWIN),
+			BANG|EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_lmap,		"lmap",		ex_map,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_lmapclear,	"lmapclear",	ex_mapclear,
-			EXTRA|TRLBAR|CMDWIN),
+			EXTRA|TRLBAR|CMDWIN,
+			ADDR_LINES),
 EX(CMD_lmake,		"lmake",	ex_make,
-			BANG|EXTRA|NOTRLCOM|TRLBAR|XFILE),
+			BANG|EXTRA|NOTRLCOM|TRLBAR|XFILE,
+			ADDR_LINES),
 EX(CMD_lnoremap,	"lnoremap",	ex_map,
-			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN,
+			ADDR_LINES),
 EX(CMD_lnext,		"lnext",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_lnewer,		"lnewer",	qf_age,
-			RANGE|NOTADR|COUNT|TRLBAR),
+			RANGE|NOTADR|COUNT|TRLBAR,
+			ADDR_LINES),
 EX(CMD_lnfile,		"lnfile",	ex_cnext,
-			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+			RANGE|NOTADR|COUNT|TRLBAR|BANG,
+			ADDR_LINES),
 EX(CMD_loadview,	"loadview",	ex_loadview,
-			FILE1|TRLBAR),
+			FILE1|TRLBAR,
+			ADDR_LINES),
 EX(CMD_loadkeymap,	"loadkeymap",	ex_loadkeymap,
-			CMDWIN),
+			CMDWIN,
+			ADDR_LINES),
 EX(CMD_lockmarks,	"lockmarks",	ex_wrongmodifier,
-			NEEDARG|EXTRA|NOTRLCOM),
+			NEEDARG|EXTRA|NOTRLCOM,
+			ADDR_LINES),
 EX(CMD_lockvar,		"lockvar",	ex_lockvar,
-			BANG|EXTRA|NEEDARG|SBOXOK|CMDWIN),
+			BANG|EXTRA|NEEDARG|SBO