diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/evalfunc.c | 2 | ||||
-rw-r--r-- | src/ex_cmds.h | 2305 | ||||
-rw-r--r-- | src/ex_docmd.c | 101 | ||||
-rw-r--r-- | src/ex_getln.c | 2 | ||||
-rw-r--r-- | src/syntax.c | 2 | ||||
-rw-r--r-- | src/usercmd.c | 56 | ||||
-rw-r--r-- | src/version.c | 2 |
7 files changed, 1234 insertions, 1236 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index b6998993f6..4ee0d5d9a1 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -3547,7 +3547,7 @@ f_expandcmd(typval_T *argvars, typval_T *rettv) memset(&eap, 0, sizeof(eap)); eap.cmd = cmdstr; eap.arg = cmdstr; - eap.argt |= NOSPC; + eap.argt |= EX_NOSPC; eap.usefilter = FALSE; eap.nextcmd = NULL; eap.cmdidx = CMD_USER; diff --git a/src/ex_cmds.h b/src/ex_cmds.h index 647dce0708..c545216731 100644 --- a/src/ex_cmds.h +++ b/src/ex_cmds.h @@ -27,39 +27,35 @@ * long name of the command. */ -#ifdef RANGE -# 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 +#define EX_RANGE 0x001 // allow a linespecs +#define EX_BANG 0x002 // allow a ! after the command name +#define EX_EXTRA 0x004 // allow extra args after command name +#define EX_XFILE 0x008 // expand wildcards in extra part +#define EX_NOSPC 0x010 // no spaces allowed in the extra part +#define EX_DFLALL 0x020 // default file range is 1,$ +#define EX_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 +#define EX_NEEDARG 0x080 // argument required +#define EX_TRLBAR 0x100 // check for trailing vertical bar +#define EX_REGSTR 0x200 // allow "x for register designation +#define EX_COUNT 0x400 // allow count in argument, after command +#define EX_NOTRLCOM 0x800 // no trailing comment allowed +#define EX_ZEROR 0x1000 // zero line number allowed +#define EX_CTRLV 0x2000 // do not remove CTRL-V from argument +#define EX_CMDARG 0x4000 // allow "+command" argument +#define EX_BUFNAME 0x8000 // accepts buffer name +#define EX_BUFUNL 0x10000 // accepts unlisted buffer too +#define EX_ARGOPT 0x20000 // allow "++opt=val" argument +#define EX_SBOXOK 0x40000 // allowed in the sandbox +#define EX_CMDWIN 0x80000 // 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 +#define EX_MODIFY 0x100000 // forbidden in non-'modifiable' buffer +#define EX_FLAGS 0x200000 // allow flags after count in argument +#define EX_RESTRICT 0x400000 // forbidden in restricted mode +#define EX_FILES (EX_XFILE | EX_EXTRA) // multiple extra files allowed +#define EX_FILE1 (EX_FILES | EX_NOSPC) // 1 file, defaults to current file +#define EX_WORD1 (EX_EXTRA | EX_NOSPC) // one extra word allowed #ifndef DO_DECLARE_EXCMD /* @@ -93,11 +89,8 @@ typedef struct exarg exarg_T; * before "rewind"). * Not supported commands are included to avoid ambiguities. */ -#ifdef EX -# undef EX // just in case -#endif #ifdef DO_DECLARE_EXCMD -# define EX(a, b, c, d, e) {(char_u *)b, c, (long_u)(d), e} +# define EXCMD(a, b, c, d, e) {(char_u *)b, c, (long_u)(d), e} typedef void (*ex_func_T) (exarg_T *eap); @@ -109,1693 +102,1695 @@ static struct cmdname cmd_addr_T cmd_addr_type; // flag for address type } cmdnames[] = #else -# define EX(a, b, c, d, e) a +# define EXCMD(a, b, c, d, e) a enum CMD_index #endif { -EX(CMD_append, "append", ex_append, - BANG|RANGE|ZEROR|TRLBAR|CMDWIN|MODIFY, +EXCMD(CMD_append, "append", ex_append, + EX_BANG|EX_RANGE|EX_ZEROR|EX_TRLBAR|EX_CMDWIN|EX_MODIFY, ADDR_LINES), -EX(CMD_abbreviate, "abbreviate", ex_abbreviate, - EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, +EXCMD(CMD_abbreviate, "abbreviate", ex_abbreviate, + EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN, ADDR_NONE), -EX(CMD_abclear, "abclear", ex_abclear, - EXTRA|TRLBAR|CMDWIN, +EXCMD(CMD_abclear, "abclear", ex_abclear, + EX_EXTRA|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_aboveleft, "aboveleft", ex_wrongmodifier, - NEEDARG|EXTRA|NOTRLCOM, +EXCMD(CMD_aboveleft, "aboveleft", ex_wrongmodifier, + EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM, ADDR_NONE), -EX(CMD_all, "all", ex_all, - BANG|RANGE|COUNT|TRLBAR, +EXCMD(CMD_all, "all", ex_all, + EX_BANG|EX_RANGE|EX_COUNT|EX_TRLBAR, ADDR_OTHER), -EX(CMD_amenu, "amenu", ex_menu, - RANGE|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, +EXCMD(CMD_amenu, "amenu", ex_menu, + EX_RANGE|EX_ZEROR|EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN, ADDR_OTHER), -EX(CMD_anoremenu, "anoremenu", ex_menu, - RANGE|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, +EXCMD(CMD_anoremenu, "anoremenu", ex_menu, + EX_RANGE|EX_ZEROR|EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN, ADDR_OTHER), -EX(CMD_args, "args", ex_args, - BANG|FILES|EDITCMD|ARGOPT|TRLBAR, +EXCMD(CMD_args, "args", ex_args, + EX_BANG|EX_FILES|EX_CMDARG|EX_ARGOPT|EX_TRLBAR, ADDR_NONE), -EX(CMD_argadd, "argadd", ex_argadd, - BANG|RANGE|ZEROR|FILES|TRLBAR, +EXCMD(CMD_argadd, "argadd", ex_argadd, + EX_BANG|EX_RANGE|EX_ZEROR|EX_FILES|EX_TRLBAR, ADDR_ARGUMENTS), -EX(CMD_argdelete, "argdelete", ex_argdelete, - BANG|RANGE|FILES|TRLBAR, +EXCMD(CMD_argdelete, "argdelete", ex_argdelete, + EX_BANG|EX_RANGE|EX_FILES|EX_TRLBAR, ADDR_ARGUMENTS), -EX(CMD_argdo, "argdo", ex_listdo, - BANG|NEEDARG|EXTRA|NOTRLCOM|RANGE|DFLALL, +EXCMD(CMD_argdo, "argdo", ex_listdo, + EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_RANGE|EX_DFLALL, ADDR_ARGUMENTS), -EX(CMD_argedit, "argedit", ex_argedit, - BANG|NEEDARG|RANGE|ZEROR|FILES|EDITCMD|ARGOPT|TRLBAR, +EXCMD(CMD_argedit, "argedit", ex_argedit, + EX_BANG|EX_NEEDARG|EX_RANGE|EX_ZEROR|EX_FILES|EX_CMDARG|EX_ARGOPT|EX_TRLBAR, ADDR_ARGUMENTS), -EX(CMD_argglobal, "argglobal", ex_args, - BANG|FILES|EDITCMD|ARGOPT|TRLBAR, +EXCMD(CMD_argglobal, "argglobal", ex_args, + EX_BANG|EX_FILES|EX_CMDARG|EX_ARGOPT|EX_TRLBAR, ADDR_NONE), -EX(CMD_arglocal, "arglocal", ex_args, - BANG|FILES|EDITCMD|ARGOPT|TRLBAR, +EXCMD(CMD_arglocal, "arglocal", ex_args, + EX_BANG|EX_FILES|EX_CMDARG|EX_ARGOPT|EX_TRLBAR, ADDR_NONE), -EX(CMD_argument, "argument", ex_argument, - BANG|RANGE|COUNT|EXTRA|EDITCMD|ARGOPT|TRLBAR, +EXCMD(CMD_argument, "argument", ex_argument, + EX_BANG|EX_RANGE|EX_COUNT|EX_EXTRA|EX_CMDARG|EX_ARGOPT|EX_TRLBAR, ADDR_ARGUMENTS), -EX(CMD_ascii, "ascii", do_ascii, - TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_ascii, "ascii", do_ascii, + EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_autocmd, "autocmd", ex_autocmd, - BANG|EXTRA|NOTRLCOM|USECTRLV|CMDWIN, +EXCMD(CMD_autocmd, "autocmd", ex_autocmd, + EX_BANG|EX_EXTRA|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN, ADDR_NONE), -EX(CMD_augroup, "augroup", ex_autocmd, - BANG|WORD1|TRLBAR|CMDWIN, +EXCMD(CMD_augroup, "augroup", ex_autocmd, + EX_BANG|EX_WORD1|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_aunmenu, "aunmenu", ex_menu, - EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, +EXCMD(CMD_aunmenu, "aunmenu", ex_menu, + EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN, ADDR_NONE), -EX(CMD_buffer, "buffer", ex_buffer, - BANG|RANGE|BUFNAME|BUFUNL|COUNT|EXTRA|EDITCMD|TRLBAR, +EXCMD(CMD_buffer, "buffer", ex_buffer, + EX_BANG|EX_RANGE|EX_BUFNAME|EX_BUFUNL|EX_COUNT|EX_EXTRA|EX_CMDARG|EX_TRLBAR, ADDR_BUFFERS), -EX(CMD_bNext, "bNext", ex_bprevious, - BANG|RANGE|COUNT|EDITCMD|TRLBAR, +EXCMD(CMD_bNext, "bNext", ex_bprevious, + EX_BANG|EX_RANGE|EX_COUNT|EX_CMDARG|EX_TRLBAR, ADDR_OTHER), -EX(CMD_ball, "ball", ex_buffer_all, - RANGE|COUNT|TRLBAR, +EXCMD(CMD_ball, "ball", ex_buffer_all, + EX_RANGE|EX_COUNT|EX_TRLBAR, ADDR_OTHER), -EX(CMD_badd, "badd", ex_edit, - NEEDARG|FILE1|EDITCMD|TRLBAR|CMDWIN, +EXCMD(CMD_badd, "badd", ex_edit, + EX_NEEDARG|EX_FILE1|EX_CMDARG|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_bdelete, "bdelete", ex_bunload, - BANG|RANGE|BUFNAME|COUNT|EXTRA|TRLBAR, +EXCMD(CMD_bdelete, "bdelete", ex_bunload, + EX_BANG|EX_RANGE|EX_BUFNAME|EX_COUNT|EX_EXTRA|EX_TRLBAR, ADDR_BUFFERS), -EX(CMD_behave, "behave", ex_behave, - BANG|NEEDARG|WORD1|TRLBAR|CMDWIN, +EXCMD(CMD_behave, "behave", ex_behave, + EX_BANG|EX_NEEDARG|EX_WORD1|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_belowright, "belowright", ex_wrongmodifier, - NEEDARG|EXTRA|NOTRLCOM, +EXCMD(CMD_belowright, "belowright", ex_wrongmodifier, + EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM, ADDR_NONE), -EX(CMD_bfirst, "bfirst", ex_brewind, - BANG|RANGE|EDITCMD|TRLBAR, +EXCMD(CMD_bfirst, "bfirst", ex_brewind, + EX_BANG|EX_RANGE|EX_CMDARG|EX_TRLBAR, ADDR_OTHER), -EX(CMD_blast, "blast", ex_blast, - BANG|RANGE|EDITCMD|TRLBAR, +EXCMD(CMD_blast, "blast", ex_blast, + EX_BANG|EX_RANGE|EX_CMDARG|EX_TRLBAR, ADDR_OTHER), -EX(CMD_bmodified, "bmodified", ex_bmodified, - BANG|RANGE|COUNT|EDITCMD|TRLBAR, +EXCMD(CMD_bmodified, "bmodified", ex_bmodified, + EX_BANG|EX_RANGE|EX_COUNT|EX_CMDARG|EX_TRLBAR, ADDR_OTHER), -EX(CMD_bnext, "bnext", ex_bnext, - BANG|RANGE|COUNT|EDITCMD|TRLBAR, +EXCMD(CMD_bnext, "bnext", ex_bnext, + EX_BANG|EX_RANGE|EX_COUNT|EX_CMDARG|EX_TRLBAR, ADDR_OTHER), -EX(CMD_botright, "botright", ex_wrongmodifier, - NEEDARG|EXTRA|NOTRLCOM, +EXCMD(CMD_botright, "botright", ex_wrongmodifier, + EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM, ADDR_NONE), -EX(CMD_bprevious, "bprevious", ex_bprevious, - BANG|RANGE|COUNT|EDITCMD|TRLBAR, +EXCMD(CMD_bprevious, "bprevious", ex_bprevious, + EX_BANG|EX_RANGE|EX_COUNT|EX_CMDARG|EX_TRLBAR, ADDR_OTHER), -EX(CMD_brewind, "brewind", ex_brewind, - BANG|RANGE|EDITCMD|TRLBAR, +EXCMD(CMD_brewind, "brewind", ex_brewind, + EX_BANG|EX_RANGE|EX_CMDARG|EX_TRLBAR, ADDR_OTHER), -EX(CMD_break, "break", ex_break, - TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_break, "break", ex_break, + EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_breakadd, "breakadd", ex_breakadd, - EXTRA|TRLBAR|CMDWIN, +EXCMD(CMD_breakadd, "breakadd", ex_breakadd, + EX_EXTRA|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_breakdel, "breakdel", ex_breakdel, - EXTRA|TRLBAR|CMDWIN, +EXCMD(CMD_breakdel, "breakdel", ex_breakdel, + EX_EXTRA|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_breaklist, "breaklist", ex_breaklist, - EXTRA|TRLBAR|CMDWIN, +EXCMD(CMD_breaklist, "breaklist", ex_breaklist, + EX_EXTRA|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_browse, "browse", ex_wrongmodifier, - NEEDARG|EXTRA|NOTRLCOM|CMDWIN, +EXCMD(CMD_browse, "browse", ex_wrongmodifier, + EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_CMDWIN, ADDR_NONE), -EX(CMD_buffers, "buffers", buflist_list, - BANG|EXTRA|TRLBAR|CMDWIN, +EXCMD(CMD_buffers, "buffers", buflist_list, + EX_BANG|EX_EXTRA|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_bufdo, "bufdo", ex_listdo, - BANG|NEEDARG|EXTRA|NOTRLCOM|RANGE|DFLALL, +EXCMD(CMD_bufdo, "bufdo", ex_listdo, + EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_RANGE|EX_DFLALL, ADDR_BUFFERS), -EX(CMD_bunload, "bunload", ex_bunload, - BANG|RANGE|BUFNAME|COUNT|EXTRA|TRLBAR, +EXCMD(CMD_bunload, "bunload", ex_bunload, + EX_BANG|EX_RANGE|EX_BUFNAME|EX_COUNT|EX_EXTRA|EX_TRLBAR, ADDR_LOADED_BUFFERS), -EX(CMD_bwipeout, "bwipeout", ex_bunload, - BANG|RANGE|BUFNAME|BUFUNL|COUNT|EXTRA|TRLBAR, +EXCMD(CMD_bwipeout, "bwipeout", ex_bunload, + EX_BANG|EX_RANGE|EX_BUFNAME|EX_BUFUNL|EX_COUNT|EX_EXTRA|EX_TRLBAR, ADDR_BUFFERS), -EX(CMD_change, "change", ex_change, - BANG|WHOLEFOLD|RANGE|COUNT|TRLBAR|CMDWIN|MODIFY, +EXCMD(CMD_change, "change", ex_change, + EX_BANG|EX_WHOLEFOLD|EX_RANGE|EX_COUNT|EX_TRLBAR|EX_CMDWIN|EX_MODIFY, ADDR_LINES), -EX(CMD_cNext, "cNext", ex_cnext, - RANGE|COUNT|TRLBAR|BANG, +EXCMD(CMD_cNext, "cNext", ex_cnext, + EX_RANGE|EX_COUNT|EX_TRLBAR|EX_BANG, ADDR_UNSIGNED), -EX(CMD_cNfile, "cNfile", ex_cnext, - RANGE|COUNT|TRLBAR|BANG, +EXCMD(CMD_cNfile, "cNfile", ex_cnext, + EX_RANGE|EX_COUNT|EX_TRLBAR|EX_BANG, ADDR_UNSIGNED), -EX(CMD_cabbrev, "cabbrev", ex_abbreviate, - EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, +EXCMD(CMD_cabbrev, "cabbrev", ex_abbreviate, + EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN, ADDR_NONE), -EX(CMD_cabclear, "cabclear", ex_abclear, - EXTRA|TRLBAR|CMDWIN, +EXCMD(CMD_cabclear, "cabclear", ex_abclear, + EX_EXTRA|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_cabove, "cabove", ex_cbelow, - RANGE|COUNT|TRLBAR, +EXCMD(CMD_cabove, "cabove", ex_cbelow, + EX_RANGE|EX_COUNT|EX_TRLBAR, ADDR_UNSIGNED), -EX(CMD_caddbuffer, "caddbuffer", ex_cbuffer, - RANGE|WORD1|TRLBAR, +EXCMD(CMD_caddbuffer, "caddbuffer", ex_cbuffer, + EX_RANGE|EX_WORD1|EX_TRLBAR, ADDR_OTHER), -EX(CMD_caddexpr, "caddexpr", ex_cexpr, - NEEDARG|WORD1|NOTRLCOM|TRLBAR, +EXCMD(CMD_caddexpr, "caddexpr", ex_cexpr, + EX_NEEDARG|EX_WORD1|EX_NOTRLCOM|EX_TRLBAR, ADDR_NONE), -EX(CMD_caddfile, "caddfile", ex_cfile, - TRLBAR|FILE1, +EXCMD(CMD_caddfile, "caddfile", ex_cfile, + EX_TRLBAR|EX_FILE1, ADDR_NONE), -EX(CMD_cafter, "cafter", ex_cbelow, - RANGE|COUNT|TRLBAR, +EXCMD(CMD_cafter, "cafter", ex_cbelow, + EX_RANGE|EX_COUNT|EX_TRLBAR, ADDR_UNSIGNED), -EX(CMD_call, "call", ex_call, - RANGE|NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN, +EXCMD(CMD_call, "call", ex_call, + EX_RANGE|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_SBOXOK|EX_CMDWIN, ADDR_LINES), -EX(CMD_catch, "catch", ex_catch, - EXTRA|SBOXOK|CMDWIN, +EXCMD(CMD_catch, "catch", ex_catch, + EX_EXTRA|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_cbuffer, "cbuffer", ex_cbuffer, - BANG|RANGE|WORD1|TRLBAR, +EXCMD(CMD_cbuffer, "cbuffer", ex_cbuffer, + EX_BANG|EX_RANGE|EX_WORD1|EX_TRLBAR, ADDR_OTHER), -EX(CMD_cbefore, "cbefore", ex_cbelow, - RANGE|COUNT|TRLBAR, +EXCMD(CMD_cbefore, "cbefore", ex_cbelow, + EX_RANGE|EX_COUNT|EX_TRLBAR, ADDR_UNSIGNED), -EX(CMD_cbelow, "cbelow", ex_cbelow, - RANGE|COUNT|TRLBAR, +EXCMD(CMD_cbelow, "cbelow", ex_cbelow, + EX_RANGE|EX_COUNT|EX_TRLBAR, ADDR_UNSIGNED), -EX(CMD_cbottom, "cbottom", ex_cbottom, - TRLBAR, +EXCMD(CMD_cbottom, "cbottom", ex_cbottom, + EX_TRLBAR, ADDR_NONE), -EX(CMD_cc, "cc", ex_cc, - RANGE|COUNT|TRLBAR|BANG, +EXCMD(CMD_cc, "cc", ex_cc, + EX_RANGE|EX_COUNT|EX_TRLBAR|EX_BANG, ADDR_QUICKFIX), -EX(CMD_cclose, "cclose", ex_cclose, - TRLBAR, +EXCMD(CMD_cclose, "cclose", ex_cclose, + EX_TRLBAR, ADDR_NONE), -EX(CMD_cd, "cd", ex_cd, - BANG|FILE1|TRLBAR|CMDWIN, +EXCMD(CMD_cd, "cd", ex_cd, + EX_BANG|EX_FILE1|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_cdo, "cdo", ex_listdo, - BANG|NEEDARG|EXTRA|NOTRLCOM|RANGE|DFLALL, +EXCMD(CMD_cdo, "cdo", ex_listdo, + EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_RANGE|EX_DFLALL, ADDR_QUICKFIX_VALID), -EX(CMD_center, "center", ex_align, - TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY, +EXCMD(CMD_center, "center", ex_align, + EX_TRLBAR|EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_MODIFY, ADDR_LINES), -EX(CMD_cexpr, "cexpr", ex_cexpr, - NEEDARG|WORD1|NOTRLCOM|TRLBAR|BANG, +EXCMD(CMD_cexpr, "cexpr", ex_cexpr, + EX_NEEDARG|EX_WORD1|EX_NOTRLCOM|EX_TRLBAR|EX_BANG, ADDR_NONE), -EX(CMD_cfile, "cfile", ex_cfile, - TRLBAR|FILE1|BANG, +EXCMD(CMD_cfile, "cfile", ex_cfile, + EX_TRLBAR|EX_FILE1|EX_BANG, ADDR_NONE), -EX(CMD_cfdo, "cfdo", ex_listdo, - BANG|NEEDARG|EXTRA|NOTRLCOM|RANGE|DFLALL, +EXCMD(CMD_cfdo, "cfdo", ex_listdo, + EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_RANGE|EX_DFLALL, ADDR_QUICKFIX_VALID), -EX(CMD_cfirst, "cfirst", ex_cc, - RANGE|COUNT|TRLBAR|BANG, +EXCMD(CMD_cfirst, "cfirst", ex_cc, + EX_RANGE|EX_COUNT|EX_TRLBAR|EX_BANG, ADDR_UNSIGNED), -EX(CMD_cgetfile, "cgetfile", ex_cfile, - TRLBAR|FILE1, +EXCMD(CMD_cgetfile, "cgetfile", ex_cfile, + EX_TRLBAR|EX_FILE1, ADDR_NONE), -EX(CMD_cgetbuffer, "cgetbuffer", ex_cbuffer, - RANGE|WORD1|TRLBAR, +EXCMD(CMD_cgetbuffer, "cgetbuffer", ex_cbuffer, + EX_RANGE|EX_WORD1|EX_TRLBAR, ADDR_OTHER), -EX(CMD_cgetexpr, "cgetexpr", ex_cexpr, - NEEDARG|WORD1|NOTRLCOM|TRLBAR, +EXCMD(CMD_cgetexpr, "cgetexpr", ex_cexpr, + EX_NEEDARG|EX_WORD1|EX_NOTRLCOM|EX_TRLBAR, ADDR_NONE), -EX(CMD_chdir, "chdir", ex_cd, - BANG|FILE1|TRLBAR|CMDWIN, +EXCMD(CMD_chdir, "chdir", ex_cd, + EX_BANG|EX_FILE1|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_changes, "changes", ex_changes, - TRLBAR|CMDWIN, +EXCMD(CMD_changes, "changes", ex_changes, + EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_checkpath, "checkpath", ex_checkpath, - TRLBAR|BANG|CMDWIN, +EXCMD(CMD_checkpath, "checkpath", ex_checkpath, + EX_TRLBAR|EX_BANG|EX_CMDWIN, ADDR_NONE), -EX(CMD_checktime, "checktime", ex_checktime, - RANGE|BUFNAME|COUNT|EXTRA|TRLBAR, +EXCMD(CMD_checktime, "checktime", ex_checktime, + EX_RANGE|EX_BUFNAME|EX_COUNT|EX_EXTRA|EX_TRLBAR, ADDR_OTHER), -EX(CMD_chistory, "chistory", qf_history, - RANGE|COUNT|TRLBAR, +EXCMD(CMD_chistory, "chistory", qf_history, + EX_RANGE|EX_COUNT|EX_TRLBAR, ADDR_UNSIGNED), -EX(CMD_clist, "clist", qf_list, - BANG|EXTRA|TRLBAR|CMDWIN, +EXCMD(CMD_clist, "clist", qf_list, + EX_BANG|EX_EXTRA|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_clast, "clast", ex_cc, - RANGE|COUNT|TRLBAR|BANG, +EXCMD(CMD_clast, "clast", ex_cc, + EX_RANGE|EX_COUNT|EX_TRLBAR|EX_BANG, ADDR_UNSIGNED), -EX(CMD_close, "close", ex_close, - BANG|RANGE|COUNT|TRLBAR|CMDWIN, +EXCMD(CMD_close, "close", ex_close, + EX_BANG|EX_RANGE|EX_COUNT|EX_TRLBAR|EX_CMDWIN, ADDR_WINDOWS), -EX(CMD_clearjumps, "clearjumps", ex_clearjumps, - TRLBAR|CMDWIN, +EXCMD(CMD_clearjumps, "clearjumps", ex_clearjumps, + EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_cmap, "cmap", ex_map, - EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, +EXCMD(CMD_cmap, "cmap", ex_map, + EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN, ADDR_NONE), -EX(CMD_cmapclear, "cmapclear", ex_mapclear, - EXTRA|TRLBAR|CMDWIN, +EXCMD(CMD_cmapclear, "cmapclear", ex_mapclear, + EX_EXTRA|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_cmenu, "cmenu", ex_menu, - RANGE|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, +EXCMD(CMD_cmenu, "cmenu", ex_menu, + EX_RANGE|EX_ZEROR|EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN, ADDR_OTHER), -EX(CMD_cnext, "cnext", ex_cnext, - RANGE|COUNT|TRLBAR|BANG, +EXCMD(CMD_cnext, "cnext", ex_cnext, + EX_RANGE|EX_COUNT|EX_TRLBAR|EX_BANG, ADDR_UNSIGNED), -EX(CMD_cnewer, "cnewer", qf_age, - RANGE|COUNT|TRLBAR, +EXCMD(CMD_cnewer, "cnewer", qf_age, + EX_RANGE|EX_COUNT|EX_TRLBAR, ADDR_UNSIGNED), -EX(CMD_cnfile, "cnfile", ex_cnext, - RANGE|COUNT|TRLBAR|BANG, +EXCMD(CMD_cnfile, "cnfile", ex_cnext, + EX_RANGE|EX_COUNT|EX_TRLBAR|EX_BANG, ADDR_UNSIGNED), -EX(CMD_cnoremap, "cnoremap", ex_map, - EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, +EXCMD(CMD_cnoremap, "cnoremap", ex_map, + EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN, ADDR_NONE), -EX(CMD_cnoreabbrev, "cnoreabbrev", ex_abbreviate, - EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, +EXCMD(CMD_cnoreabbrev, "cnoreabbrev", ex_abbreviate, + EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN, ADDR_NONE), -EX(CMD_cnoremenu, "cnoremenu", ex_menu, - RANGE|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, +EXCMD(CMD_cnoremenu, "cnoremenu", ex_menu, + EX_RANGE|EX_ZEROR|EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN, ADDR_OTHER), -EX(CMD_copy, "copy", ex_copymove, - RANGE|WHOLEFOLD|EXTRA|TRLBAR|CMDWIN|MODIFY, +EXCMD(CMD_copy, "copy", ex_copymove, + EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_MODIFY, ADDR_LINES), -EX(CMD_colder, "colder", qf_age, - RANGE|COUNT|TRLBAR, +EXCMD(CMD_colder, "colder", qf_age, + EX_RANGE|EX_COUNT|EX_TRLBAR, ADDR_UNSIGNED), -EX(CMD_colorscheme, "colorscheme", ex_colorscheme, - WORD1|TRLBAR|CMDWIN, +EXCMD(CMD_colorscheme, "colorscheme", ex_colorscheme, + EX_WORD1|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_command, "command", ex_command, - EXTRA|BANG|NOTRLCOM|USECTRLV|CMDWIN, +EXCMD(CMD_command, "command", ex_command, + EX_EXTRA|EX_BANG|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN, ADDR_NONE), -EX(CMD_comclear, "comclear", ex_comclear, - TRLBAR|CMDWIN, +EXCMD(CMD_comclear, "comclear", ex_comclear, + EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_compiler, "compiler", ex_compiler, - BANG|TRLBAR|WORD1|CMDWIN, +EXCMD(CMD_compiler, "compiler", ex_compiler, + EX_BANG|EX_TRLBAR|EX_WORD1|EX_CMDWIN, ADDR_NONE), -EX(CMD_continue, "continue", ex_continue, - TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_continue, "continue", ex_continue, + EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_confirm, "confirm", ex_wrongmodifier, - NEEDARG|EXTRA|NOTRLCOM|CMDWIN, +EXCMD(CMD_confirm, "confirm", ex_wrongmodifier, + EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_CMDWIN, ADDR_NONE), -EX(CMD_const, "const", ex_const, - EXTRA|NOTRLCOM|SBOXOK|CMDWIN, +EXCMD(CMD_const, "const", ex_const, + EX_EXTRA|EX_NOTRLCOM|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_copen, "copen", ex_copen, - RANGE|COUNT|TRLBAR, +EXCMD(CMD_copen, "copen", ex_copen, + EX_RANGE|EX_COUNT|EX_TRLBAR, ADDR_OTHER), -EX(CMD_cprevious, "cprevious", ex_cnext, - RANGE|COUNT|TRLBAR|BANG, +EXCMD(CMD_cprevious, "cprevious", ex_cnext, + EX_RANGE|EX_COUNT|EX_TRLBAR|EX_BANG, ADDR_UNSIGNED), -EX(CMD_cpfile, "cpfile", ex_cnext, - RANGE|COUNT|TRLBAR|BANG, +EXCMD(CMD_cpfile, "cpfile", ex_cnext, + EX_RANGE|EX_COUNT|EX_TRLBAR|EX_BANG, ADDR_OTHER), -EX(CMD_cquit, "cquit", ex_cquit, - TRLBAR|BANG, +EXCMD(CMD_cquit, "cquit", ex_cquit, + EX_TRLBAR|EX_BANG, ADDR_NONE), -EX(CMD_crewind, "crewind", ex_cc, - RANGE|COUNT|TRLBAR|BANG, +EXCMD(CMD_crewind, "crewind", ex_cc, + EX_RANGE|EX_COUNT|EX_TRLBAR|EX_BANG, ADDR_UNSIGNED), -EX(CMD_cscope, "cscope", ex_cscope, - EXTRA|NOTRLCOM|XFILE, +EXCMD(CMD_cscope, "cscope", ex_cscope, + EX_EXTRA|EX_NOTRLCOM|EX_XFILE, ADDR_NONE), -EX(CMD_cstag, "cstag", ex_cstag, - BANG|TRLBAR|WORD1, +EXCMD(CMD_cstag, "cstag", ex_cstag, + EX_BANG|EX_TRLBAR|EX_WORD1, ADDR_NONE), -EX(CMD_cunmap, "cunmap", ex_unmap, - EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, +EXCMD(CMD_cunmap, "cunmap", ex_unmap, + EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN, ADDR_NONE), -EX(CMD_cunabbrev, "cunabbrev", ex_abbreviate, - EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, +EXCMD(CMD_cunabbrev, "cunabbrev", ex_abbreviate, + EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN, ADDR_NONE), -EX(CMD_cunmenu, "cunmenu", ex_menu, - EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN, +EXCMD(CMD_cunmenu, "cunmenu", ex_menu, + EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN, ADDR_NONE), -EX(CMD_cwindow, "cwindow", ex_cwindow, - RANGE|COUNT|TRLBAR, +EXCMD(CMD_cwindow, "cwindow", ex_cwindow, + EX_RANGE|EX_COUNT|EX_TRLBAR, ADDR_OTHER), -EX(CMD_delete, "delete", ex_operators, - RANGE|WHOLEFOLD|REGSTR|COUNT|TRLBAR|CMDWIN|MODIFY, +EXCMD(CMD_delete, "delete", ex_operators, + EX_RANGE|EX_WHOLEFOLD|EX_REGSTR|EX_COUNT|EX_TRLBAR|EX_CMDWIN|EX_MODIFY, ADDR_LINES), -EX(CMD_delmarks, "delmarks", ex_delmarks, - BANG|EXTRA|TRLBAR|CMDWIN, +EXCMD(CMD_delmarks, "delmarks", ex_delmarks, + EX_BANG|EX_EXTRA|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_debug, "debug", ex_debug, - NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN, +EXCMD(CMD_debug, "debug", ex_debug, + EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_debuggreedy, "debuggreedy", ex_debuggreedy, - RANGE|ZEROR|TRLBAR|CMDWIN, +EXCMD(CMD_debuggreedy, "debuggreedy", ex_debuggreedy, + EX_RANGE|EX_ZEROR|EX_TRLBAR|EX_CMDWIN, ADDR_OTHER), -EX(CMD_delcommand, "delcommand", ex_delcommand, - NEEDARG|WORD1|TRLBAR|CMDWIN, +EXCMD(CMD_delcommand, "delcommand", ex_delcommand, + EX_NEEDARG|EX_WORD1|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_delfunction, "delfunction", ex_delfunction, - BANG|NEEDARG|WORD1|CMDWIN, +EXCMD(CMD_delfunction, "delfunction", ex_delfunction, + EX_BANG|EX_NEEDARG|EX_WORD1|EX_CMDWIN, ADDR_NONE), -EX(CMD_display, "display", ex_display, - EXTRA|NOTRLCOM|TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_display, "display", ex_display, + EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_diffupdate, "diffupdate", ex_diffupdate, - BANG|TRLBAR, +EXCMD(CMD_diffupdate, "diffupdate", ex_diffupdate, + EX_BANG|EX_TRLBAR, ADDR_NONE), -EX(CMD_diffget, "diffget", ex_diffgetput, - RANGE|EXTRA|TRLBAR|MODIFY, +EXCMD(CMD_diffget, "diffget", ex_diffgetput, + EX_RANGE|EX_EXTRA|EX_TRLBAR|EX_MODIFY, ADDR_LINES), -EX(CMD_diffoff, "diffoff", ex_diffoff, - BANG|TRLBAR, +EXCMD(CMD_diffoff, "diffoff", ex_diffoff, + EX_BANG|EX_TRLBAR, ADDR_NONE), -EX(CMD_diffpatch, "diffpatch", ex_diffpatch, - EXTRA|FILE1|TRLBAR|MODIFY, +EXCMD(CMD_diffpatch, "diffpatch", ex_diffpatch, + EX_EXTRA|EX_FILE1|EX_TRLBAR|EX_MODIFY, ADDR_NONE), -EX(CMD_diffput, "diffput", ex_diffgetput, - RANGE|EXTRA|TRLBAR, +EXCMD(CMD_diffput, "diffput", ex_diffgetput, + EX_RANGE|EX_EXTRA|EX_TRLBAR, ADDR_LINES), -EX(CMD_diffsplit, "diffsplit", ex_diffsplit, - EXTRA|FILE1|TRLBAR, +EXCMD(CMD_diffsplit, "diffsplit", ex_diffsplit, + EX_EXTRA|EX_FILE1|EX_TRLBAR, ADDR_NONE), -EX(CMD_diffthis, "diffthis", ex_diffthis, - TRLBAR, +EXCMD(CMD_diffthis, "diffthis", ex_diffthis, + EX_TRLBAR, ADDR_NONE), -EX(CMD_digraphs, "digraphs", ex_digraphs, - BANG|EXTRA|TRLBAR|CMDWIN, +EXCMD(CMD_digraphs, "digraphs", ex_digraphs, + EX_BANG|EX_EXTRA|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_djump, "djump", ex_findpat, - BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA, +EXCMD(CMD_djump, "djump", ex_findpat, + EX_BANG|EX_RANGE|EX_DFLALL|EX_WHOLEFOLD|EX_EXTRA, ADDR_LINES), -EX(CMD_dlist, "dlist", ex_findpat, - BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN, +EXCMD(CMD_dlist, "dlist", ex_findpat, + EX_BANG|EX_RANGE|EX_DFLALL|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN, ADDR_LINES), -EX(CMD_doautocmd, "doautocmd", ex_doautocmd, - EXTRA|TRLBAR|CMDWIN, +EXCMD(CMD_doautocmd, "doautocmd", ex_doautocmd, + EX_EXTRA|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_doautoall, "doautoall", ex_doautoall, - EXTRA|TRLBAR|CMDWIN, +EXCMD(CMD_doautoall, "doautoall", ex_doautoall, + EX_EXTRA|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_drop, "drop", ex_drop, - FILES|EDITCMD|NEEDARG|ARGOPT|TRLBAR, +EXCMD(CMD_drop, "drop", ex_drop, + EX_FILES|EX_CMDARG|EX_NEEDARG|EX_ARGOPT|EX_TRLBAR, ADDR_NONE), -EX(CMD_dsearch, "dsearch", ex_findpat, - BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN, +EXCMD(CMD_dsearch, "dsearch", ex_findpat, + EX_BANG|EX_RANGE|EX_DFLALL|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN, ADDR_LINES), -EX(CMD_dsplit, "dsplit", ex_findpat, - BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA, +EXCMD(CMD_dsplit, "dsplit", ex_findpat, + EX_BANG|EX_RANGE|EX_DFLALL|EX_WHOLEFOLD|EX_EXTRA, ADDR_LINES), -EX(CMD_edit, "edit", ex_edit, - BANG|FILE1|EDITCMD|ARGOPT|TRLBAR, +EXCMD(CMD_edit, "edit", ex_edit, + EX_BANG|EX_FILE1|EX_CMDARG|EX_ARGOPT|EX_TRLBAR, ADDR_NONE), -EX(CMD_earlier, "earlier", ex_later, - TRLBAR|EXTRA|NOSPC|CMDWIN, +EXCMD(CMD_earlier, "earlier", ex_later, + EX_TRLBAR|EX_EXTRA|EX_NOSPC|EX_CMDWIN, ADDR_NONE), -EX(CMD_echo, "echo", ex_echo, - EXTRA|NOTRLCOM|SBOXOK|CMDWIN, +EXCMD(CMD_echo, "echo", ex_echo, + EX_EXTRA|EX_NOTRLCOM|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_echoerr, "echoerr", ex_execute, - EXTRA|NOTRLCOM|SBOXOK|CMDWIN, +EXCMD(CMD_echoerr, "echoerr", ex_execute, + EX_EXTRA|EX_NOTRLCOM|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_echohl, "echohl", ex_echohl, - EXTRA|TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_echohl, "echohl", ex_echohl, + EX_EXTRA|EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_echomsg, "echomsg", ex_execute, - EXTRA|NOTRLCOM|SBOXOK|CMDWIN, +EXCMD(CMD_echomsg, "echomsg", ex_execute, + EX_EXTRA|EX_NOTRLCOM|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_echon, "echon", ex_echo, - EXTRA|NOTRLCOM|SBOXOK|CMDWIN, +EXCMD(CMD_echon, "echon", ex_echo, + EX_EXTRA|EX_NOTRLCOM|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_else, "else", ex_else, - TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_else, "else", ex_else, + EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_elseif, "elseif", ex_else, - EXTRA|NOTRLCOM|SBOXOK|CMDWIN, +EXCMD(CMD_elseif, "elseif", ex_else, + EX_EXTRA|EX_NOTRLCOM|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_emenu, "emenu", ex_emenu, - NEEDARG|EXTRA|TRLBAR|NOTRLCOM|RANGE|CMDWIN, +EXCMD(CMD_emenu, "emenu", ex_emenu, + EX_NEEDARG|EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_RANGE|EX_CMDWIN, ADDR_OTHER), -EX(CMD_endif, "endif", ex_endif, - TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_endif, "endif", ex_endif, + EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_endfunction, "endfunction", ex_endfunction, - TRLBAR|CMDWIN, +EXCMD(CMD_endfunction, "endfunction", ex_endfunction, + EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_endfor, "endfor", ex_endwhile, - TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_endfor, "endfor", ex_endwhile, + EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_endtry, "endtry", ex_endtry, - TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_endtry, "endtry", ex_endtry, + EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_endwhile, "endwhile", ex_endwhile, - TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_endwhile, "endwhile", ex_endwhile, + EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_enew, "enew", ex_edit, - BANG|TRLBAR, +EXCMD(CMD_enew, "enew", ex_edit, + EX_BANG|EX_TRLBAR, ADDR_NONE), -EX(CMD_ex, "ex", ex_edit, - BANG|FILE1|EDITCMD|ARGOPT|TRLBAR, +EXCMD(CMD_ex, "ex", ex_edit, + EX_BANG|EX_FILE1|EX_CMDARG|EX_ARGOPT|EX_TRLBAR, ADDR_NONE), -EX(CMD_execute, "execute", ex_execute, - EXTRA|NOTRLCOM|SBOXOK|CMDWIN, +EXCMD(CMD_execute, "execute", ex_execute, + EX_EXTRA|EX_NOTRLCOM|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_exit, "exit", ex_exit, - RANGE|WHOLEFOLD|BANG|FILE1|ARGOPT|DFLALL|TRLBAR|CMDWIN, +EXCMD(CMD_exit, "exit", ex_exit, + EX_RANGE|EX_WHOLEFOLD|EX_BANG|EX_FILE1|EX_ARGOPT|EX_DFLALL|EX_TRLBAR|EX_CMDWIN, ADDR_LINES), -EX(CMD_exusage, "exusage", ex_exusage, - TRLBAR, +EXCMD(CMD_exusage, "exusage", ex_exusage, + EX_TRLBAR, ADDR_NONE), -EX(CMD_file, "file", ex_file, - RANGE|ZEROR|BANG|FILE1|TRLBAR, +EXCMD(CMD_file, "file", ex_file, + EX_RANGE|EX_ZEROR|EX_BANG|EX_FILE1|EX_TRLBAR, ADDR_OTHER), -EX(CMD_files, "files", buflist_list, - BANG|EXTRA|TRLBAR|CMDWIN, +EXCMD(CMD_files, "files", buflist_list, + EX_BANG|EX_EXTRA|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_filetype, "filetype", ex_filetype, - EXTRA|TRLBAR|CMDWIN, +EXCMD(CMD_filetype, "filetype", ex_filetype, + EX_EXTRA|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_filter, "filter", ex_wrongmodifier, - BANG|NEEDARG|EXTRA|NOTRLCOM, +EXCMD(CMD_filter, "filter", ex_wrongmodifier, + EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM, ADDR_NONE), -EX(CMD_find, "find", ex_find, - RANGE|BANG|FILE1|EDITCMD|ARGOPT|TRLBAR, +EXCMD(CMD_find, "find", ex_find, + EX_RANGE|EX_BANG|EX_FILE1|EX_CMDARG|EX_ARGOPT|EX_TRLBAR, ADDR_OTHER), -EX(CMD_finally, "finally", ex_finally, - TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_finally, "finally", ex_finally, + EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_finish, "finish", ex_finish, - TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_finish, "finish", ex_finish, + EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_first, "first", ex_rewind, - EXTRA|BANG|EDITCMD|ARGOPT|TRLBAR, +EXCMD(CMD_first, "first", ex_rewind, + EX_EXTRA|EX_BANG|EX_CMDARG|EX_ARGOPT|EX_TRLBAR, ADDR_NONE), -EX(CMD_fixdel, "fixdel", do_fixdel, - TRLBAR|CMDWIN, +EXCMD(CMD_fixdel, "fixdel", do_fixdel, + EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_fold, "fold", ex_fold, - RANGE|WHOLEFOLD|TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_fold, "fold", ex_fold, + EX_RANGE|EX_WHOLEFOLD|EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_LINES), -EX(CMD_foldclose, "foldclose", ex_foldopen, - RANGE|BANG|WHOLEFOLD|TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_foldclose, "foldclose", ex_foldopen, + EX_RANGE|EX_BANG|EX_WHOLEFOLD|EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_LINES), -EX(CMD_folddoopen, "folddoopen", ex_folddo, - RANGE|DFLALL|NEEDARG|EXTRA|NOTRLCOM, +EXCMD(CMD_folddoopen, "folddoopen", ex_folddo, + EX_RANGE|EX_DFLALL|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM, ADDR_LINES), -EX(CMD_folddoclosed, "folddoclosed", ex_folddo, - RANGE|DFLALL|NEEDARG|EXTRA|NOTRLCOM, +EXCMD(CMD_folddoclosed, "folddoclosed", ex_folddo, + EX_RANGE|EX_DFLALL|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM, ADDR_LINES), -EX(CMD_foldopen, "foldopen", ex_foldopen, - RANGE|BANG|WHOLEFOLD|TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_foldopen, "foldopen", ex_foldopen, + EX_RANGE|EX_BANG|EX_WHOLEFOLD|EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_LINES), -EX(CMD_for, "for", ex_while, - EXTRA|NOTRLCOM|SBOXOK|CMDWIN, +EXCMD(CMD_for, "for", ex_while, + EX_EXTRA|EX_NOTRLCOM|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_function, "function", ex_function, - EXTRA|BANG|SBOXOK|CMDWIN, +EXCMD(CMD_function, "function", ex_function, + EX_EXTRA|EX_BANG|EX_SBOXOK|EX_CMDWIN, ADDR_NONE), -EX(CMD_global, "global", ex_global, - RANGE|WHOLEFOLD|BANG|EXTRA|DFLALL|SBOXOK|CMDWIN, +EXCMD(CMD_global, "global", ex_global, + EX_RANGE|EX_WHOLEFOLD|EX_BANG|EX_EXTRA|EX_DFLALL|EX_SBOXOK|EX_CMDWIN, ADDR_LINES), -EX(CMD_goto, "goto", ex_goto, - RANGE|COUNT|TRLBAR|SBOXOK|CMDWIN, +EXCMD(CMD_goto, "goto", ex_goto, + EX_RANGE|EX_COUNT|EX_TRLBAR|EX_SBOXOK|EX_CMDWIN, ADDR_OTHER), -EX(CMD_grep, "grep", ex_make, - RANGE|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE, +EXCMD(CMD_grep, "grep", ex_make, + EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE, ADDR_OTHER), -EX(CMD_grepadd, "grepadd", ex_make, - RANGE|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE, +EXCMD(CMD_grepadd, "grepadd", ex_make, + EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE, ADDR_OTHER), -EX(CMD_gui, "gui", ex_gui, - BANG|FILES|EDITCMD|ARGOPT|TRLBAR|CMDWIN, +EXCMD(CMD_gui, "gui", ex_gui, + EX_BANG|EX_FILES|EX_CMDARG|EX_ARGOPT|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_gvim, "gvim", ex_gui, - BANG|FILES|EDITCMD|ARGOPT|TRLBAR|CMDWIN, +EXCMD(CMD_gvim, "gvim", ex_gui, + EX_BANG|EX_FILES|EX_CMDARG|EX_ARGOPT|EX_TRLBAR|EX_CMDWIN, ADDR_NONE), -EX(CMD_help, "help", ex_help, - BANG|EXTRA|NOTRLCOM, +EXCMD(CMD_help, "help", ex_help, + EX_BANG|EX_EXTRA|EX_NOTRLCOM, ADDR_NONE), -EX(CMD_helpclose, "helpclose", ex_helpclose, - RANGE|COUNT|TRLBAR, +EXCMD(CMD_helpclose, "helpclose", ex_helpclose, + EX_RANGE|EX_COUNT|EX_TRLBAR, ADDR_OTHER), -EX(CMD_helpfind, "helpfind", ex_helpfind, - EXTRA|NOTRLCOM, +EXCMD(CMD_helpfind, "helpfind", ex_helpfind, + EX_EXTRA|EX_NOTRLCOM, ADDR_NONE), -EX(CMD_helpgrep, "helpgrep", ex_helpgrep, - EXTRA|NOTRLCOM|NEEDARG, +EXCMD(CMD_helpgrep, "helpgrep", ex_helpgrep, + EX_EXTRA|EX_NOTRLCOM|EX_NEEDARG, ADDR_NONE), -EX(CMD_helptags, "helptags", ex_helptags, - NEEDARG|FILES|TRLBAR|CMDWIN, +EXCMD(CMD_helptags, "helptags", ex_helptags, + EX_NEE |