To: vim_dev@googlegroups.com

Subject: Patch 7.4.530

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.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)

Files:	    runtime/doc/editing.txt, runtime/doc/tabpage.txt,

	    runtime/doc/windows.txt, src/Makefile, src/ex_cmds.h,

	    src/ex_docmd.c, src/testdir/Make_amiga.mak

	    src/testdir/Make_dos.mak, src/testdir/Make_ming.mak,

	    src/testdir/Make_os2.mak, src/testdir/Make_vms.mms,

	    src/testdir/Makefile, src/testdir/test_argument_count.in,

	    src/testdir/test_argument_count.ok,

	    src/testdir/test_close_count.in, src/testdir/test_close_count.ok,

	    src/window.c

*** ../vim-7.4.529/runtime/doc/editing.txt	2014-08-10 13:34:59.048785459 +0200

--- runtime/doc/editing.txt	2014-11-27 14:36:09.312502238 +0100

***************

*** 608,614 ****

  			{not in Vi}

  :[count]arga[dd] {name} ..			*:arga* *:argadd* *E479*

! 			Add the {name}s to the argument list.

  			If [count] is omitted, the {name}s are added just

  			after the current entry in the argument list.

  			Otherwise they are added after the [count]'th file.

--- 609,618 ----

  			{not in Vi}

  :[count]arga[dd] {name} ..			*:arga* *:argadd* *E479*

! :[count]arga[dd]

! 			Add the {name}s to the argument list.  When {name} is

! 			omitted at the current buffer name to the argument

! 			list.

  			If [count] is omitted, the {name}s are added just

  			after the current entry in the argument list.

  			Otherwise they are added after the [count]'th file.

***************

*** 618,624 ****

  				:argadd x	a b x c

  				:0argadd x	x a b c

  				:1argadd x	a x b c

! 				:99argadd x	a b c x

  			There is no check for duplicates, it is possible to

  			add a file to the argument list twice.

  			The currently edited file is not changed.

--- 622,629 ----

  				:argadd x	a b x c

  				:0argadd x	x a b c

  				:1argadd x	a x b c

! 				:$argadd x	a b c x

! 				:+2argadd y	a b c x y

  			There is no check for duplicates, it is possible to

  			add a file to the argument list twice.

  			The currently edited file is not changed.

***************

*** 640,650 ****

  <			{not in Vi} {not available when compiled without the

  			|+listcmds| feature}

! :{range}argd[elete]	Delete the {range} files from the argument list.

  			When the last number in the range is too high, up to

! 			the last argument is deleted.  Example: >

! 				:10,1000argdel

! <			Deletes arguments 10 and further, keeping 1-9.

  			{not in Vi} {not available when compiled without the

  			|+listcmds| feature}

--- 645,663 ----

  <			{not in Vi} {not available when compiled without the

  			|+listcmds| feature}

! :[range]argd[elete]	Delete the {range} files from the argument list.

! 			Example: >

! 				:10,$argdel

! <			Deletes arguments 10 and further, keeping 1-9. >

! 				:$argd

! <			Deletes just the last one. >

! 				:argd

! 				:.argd

! <			Deletes the current argument. >

! 				:%argd

! <			Removes all the files from the arglist.

  			When the last number in the range is too high, up to

! 			the last argument is deleted.

  			{not in Vi} {not available when compiled without the

  			|+listcmds| feature}

***************

*** 1076,1084 ****

  			the last file in the argument list has not been

  			edited.  See |:confirm| and 'confirm'.  {not in Vi}

! :q[uit]!		Quit without writing, also when visible buffers have

! 			changes.  Does not exit when there are changed hidden

! 			buffers.  Use ":qall!" to exit always.

  :cq[uit]		Quit always, without writing, and return an error

  			code.  See |:cq|.  Used for Manx's QuickFix mode (see

--- 1089,1100 ----

  			the last file in the argument list has not been

  			edited.  See |:confirm| and 'confirm'.  {not in Vi}

! :q[uit]!		Quit without writing, also when currently visible

! 			buffers have changes.  Does not exit when this is the

! 			last window and there are is a changed hidden buffer.

! 			In this case, the first changed hidden buffer becomes

! 			the current buffer.

! 			Use ":qall!" to exit always.

  :cq[uit]		Quit always, without writing, and return an error

  			code.  See |:cq|.  Used for Manx's QuickFix mode (see

*** ../vim-7.4.529/runtime/doc/tabpage.txt	2013-08-10 13:25:01.000000000 +0200

--- runtime/doc/tabpage.txt	2014-11-27 14:42:13.340492837 +0100

***************

*** 61,76 ****

  :[count]tabe[dit]				*:tabe* *:tabedit* *:tabnew*

  :[count]tabnew

  		Open a new tab page with an empty window, after the current

! 		tab page.  For [count] see |:tab| below.

  :[count]tabe[dit] [++opt] [+cmd] {file}

  :[count]tabnew [++opt] [+cmd] {file}

  		Open a new tab page and edit {file}, like with |:edit|.

! 		For [count] see |:tab| below.

  :[count]tabf[ind] [++opt] [+cmd] {file}			*:tabf* *:tabfind*

  		Open a new tab page and edit {file} in 'path', like with

! 		|:find|.  For [count] see |:tab| below.

  		{not available when the |+file_in_path| feature was disabled

  		at compile time}

--- 61,85 ----

  :[count]tabe[dit]				*:tabe* *:tabedit* *:tabnew*

  :[count]tabnew

  		Open a new tab page with an empty window, after the current

! 		tab page.  If [count] is given the new tab page appears after

! 		the tab page [count] otherwise the new tab page will appear

! 		after the current one. >

! 		    :tabnew	" opens tabpage after the current one

! 		    :.tabnew	" as above

! 		    :+tabnew	" opens tabpage after the next tab page

! 				" note: it is one further than :tabnew

! 		    :-tabnew	" opens tabpage before the current one

! 		    :0tabnew	" opens tabpage before the first one

! 		    :$tabnew	" opens tabpage after the last one

  :[count]tabe[dit] [++opt] [+cmd] {file}

  :[count]tabnew [++opt] [+cmd] {file}

  		Open a new tab page and edit {file}, like with |:edit|.

! 		For [count] see |:tabnew| above.

  :[count]tabf[ind] [++opt] [+cmd] {file}			*:tabf* *:tabfind*

  		Open a new tab page and edit {file} in 'path', like with

! 		|:find|.  For [count] see |:tabnew| above.

  		{not available when the |+file_in_path| feature was disabled

  		at compile time}

***************

*** 110,121 ****

  		- When 'hidden' is not set, [!] is not used, a buffer has

  		  changes, and there is no other window on this buffer.

  		Changes to the buffer are not written and won't get lost, so

! 		this is a "safe" command.

  :tabc[lose][!] {count}

  		Close tab page {count}.  Fails in the same way as `:tabclose`

! 		above.

! 

  							*:tabo* *:tabonly*

  :tabo[nly][!]	Close all other tab pages.

  		When the 'hidden' option is set, all buffers in closed windows

--- 119,136 ----

  		- When 'hidden' is not set, [!] is not used, a buffer has

  		  changes, and there is no other window on this buffer.

  		Changes to the buffer are not written and won't get lost, so

! 		this is a "safe" command. >

! 		    :tabclose	    " close the current tab page

+ :{count}tabc[lose][!]

  :tabc[lose][!] {count}

  		Close tab page {count}.  Fails in the same way as `:tabclose`

! 		above. >

! 		    :-tabclose	    " close the previous tab page

! 		    :+tabclose	    " close the next tab page

! 		    :1tabclose	    " close the first tab page

! 		    :$tabclose	    " close the last tab page

! <

  							*:tabo* *:tabonly*

  :tabo[nly][!]	Close all other tab pages.

  		When the 'hidden' option is set, all buffers in closed windows

***************

*** 124,130 ****

  		modified buffers are written.  Otherwise, windows that have

  		buffers that are modified are not removed, unless the [!] is

  		given, then they become hidden.  But modified buffers are

! 		never abandoned, so changes cannot get lost.

  SWITCHING TO ANOTHER TAB PAGE:

--- 139,155 ----

  		modified buffers are written.  Otherwise, windows that have

  		buffers that are modified are not removed, unless the [!] is

  		given, then they become hidden.  But modified buffers are

! 		never abandoned, so changes cannot get lost. >

! 		    :tabonly	    " close all tab pages except the current

! 

! :{count}tabo[nly][!]

! 		Close all tab pages except the {count}th one. >

! 		    :.tabonly	    " one

! 		    :-tabonly	    " close all tab pages except the previous

! 				    " one

! 		    :+tabonly	    " close all tab pages except the next one

! 		    :1tabonly	    " close all tab pages except the first one

! 		    :$tabonly	    " close all tab pages except the last one

  SWITCHING TO ANOTHER TAB PAGE:

***************

*** 176,182 ****

  :[N]tabm[ove]

  		Move the current tab page to after tab page N.  Use zero to

  		make the current tab page the first one.  Without N the tab

! 		page is made the last one.

  :tabm[ove] +[N]

  :tabm[ove] -[N]

--- 201,215 ----

  :[N]tabm[ove]

  		Move the current tab page to after tab page N.  Use zero to

  		make the current tab page the first one.  Without N the tab

! 		page is made the last one. >

! 		    :-tabmove	" move the tab page to the left

! 		    :tabmove	" move the tab page to the right

! 		    :.tabmove	" as above

! 		    :+tabmove	" as above

! 		    :0tabmove	" move the tab page to the begining of the tab

! 				" list

! 		    :$tabmove	" move the tab page to the end of the tab list

! <

  :tabm[ove] +[N]

  :tabm[ove] -[N]

*** ../vim-7.4.529/runtime/doc/windows.txt	2014-09-19 20:07:22.542449677 +0200

--- runtime/doc/windows.txt	2014-11-27 14:52:42.261566503 +0100

***************

*** 263,290 ****

  Closing a window

  ----------------

  CTRL-W q						*CTRL-W_q*

  CTRL-W CTRL-Q						*CTRL-W_CTRL-Q*

! :q[uit]		Quit current window.  When quitting the last window (not

! 		counting a help window), exit Vim.

  		When 'hidden' is set, and there is only one window for the

! 		current buffer, it becomes hidden.

! 		When 'hidden' is not set, and there is only one window for the

! 		current buffer, and the buffer was changed, the command fails.

! 		(Note: CTRL-Q does not work on all terminals)

! 

! :q[uit]!	Quit current window.  If this was the last window for a buffer,

! 		any changes to that buffer are lost.  When quitting the last

! 		window (not counting help windows), exit Vim.  The contents of

! 		the buffer are lost, even when 'hidden' is set.

  CTRL-W c					*CTRL-W_c* *:clo* *:close*

! :clo[se][!]	Close current window.  When the 'hidden' option is set, or

! 		when the buffer was changed and the [!] is used, the buffer

! 		becomes hidden (unless there is another window editing it).

  		When there is only one window in the current tab page and

  		there is another tab page, this closes the current tab page.

  		|tab-page|.

  		This command fails when:			*E444*

  		- There is only one window on the screen.

  		- When 'hidden' is not set, [!] is not used, the buffer has

--- 263,318 ----

  Closing a window

  ----------------

+ :q[uit]

+ :{count}q[uit]

  CTRL-W q						*CTRL-W_q*

  CTRL-W CTRL-Q						*CTRL-W_CTRL-Q*

! 		Without {count}: Quit the current window.  If {count} is

! 		given quit the {count} window.

! 

! 		When quitting the last window (not counting a help window),

! 		exit Vim.

! 		

  		When 'hidden' is set, and there is only one window for the

! 		current buffer, it becomes hidden.  When 'hidden' is not set,

! 		and there is only one window for the current buffer, and the

! 		buffer was changed, the command fails.

! 		

! 		(Note: CTRL-Q does not

! 		work on all terminals).  If [count] is greater than

! 		the last window number the last window will be closed: >

! 		    :1quit  " quit the first window

! 		    :$quit  " quit the last window

! 		    :9quit  " quit the last window

! 			     " if there are less than 9 windows opened

! 		    :-quit  " quit the previews window

! 		    :+quit  " quit the next window

! 		    :+2quit " will also work as expected

! <

! :q[uit]!

! :{count}q[uit]!

! 		Without {count}: Quit the current window.  If {count} is

! 		given quit the {count} window.

! 

! 		If this was the last window for a buffer, any changes to that

! 		buffer are lost.  When quitting the last window (not counting

! 		help windows), exit Vim.  The contents of the buffer are lost,

! 		even when 'hidden' is set.

+ :clo[se][!]

+ :{count}clo[se][!]

  CTRL-W c					*CTRL-W_c* *:clo* *:close*

! 		Without {count}: Close the current window.  If {count} is

! 		given close the {count} window.

! 

! 		When the 'hidden' option is set, or when the buffer was

! 		changed and the [!] is used, the buffer becomes hidden (unless

! 		there is another window editing it).

! 		

  		When there is only one window in the current tab page and

  		there is another tab page, this closes the current tab page.

  		|tab-page|.

+ 

  		This command fails when:			*E444*

  		- There is only one window on the screen.

  		- When 'hidden' is not set, [!] is not used, the buffer has

***************

*** 298,311 ****

  		command.

  							*:hide*

! :hid[e]		Quit current window, unless it is the last window on the

! 		screen.  The buffer becomes hidden (unless there is another

! 		window editing it or 'bufhidden' is "unload" or "delete").

! 		If the window is the last one in the current tab page the tab

! 		page is closed. |tab-page|

! 		The value of 'hidden' is irrelevant for this command.

! 		Changes to the buffer are not written and won't get lost, so

! 		this is a "safe" command.

  :hid[e] {cmd}	Execute {cmd} with 'hidden' is set.  The previous value of

  		'hidden' is restored after {cmd} has been executed.

--- 326,344 ----

  		command.

  							*:hide*

! :hid[e]

! :{count}hid[e]

! 		Quit the current window, unless it is the last window on the

! 		screen.  For {count} see |:quit| command.

! 		

! 		The buffer becomes hidden (unless there is another window

! 		editing it or 'bufhidden' is "unload" or "delete").  If the

! 		window is the last one in the current tab page the tab page is

! 		closed.  |tab-page| 

! 		

! 		The value of 'hidden' is irrelevant for this command.  Changes

! 		to the buffer are not written and won't get lost, so this is a

! 		"safe" command.

  :hid[e] {cmd}	Execute {cmd} with 'hidden' is set.  The previous value of

  		'hidden' is restored after {cmd} has been executed.

***************

*** 314,325 ****

  <		This will edit "Makefile", and hide the current buffer if it

  		has any changes.

  CTRL-W o						*CTRL-W_o* *E445*

  CTRL-W CTRL-O					*CTRL-W_CTRL-O* *:on* *:only*

! :on[ly][!]	Make the current window the only one on the screen.  All other

! 		windows are closed.

  		When the 'hidden' option is set, all buffers in closed windows

  		become hidden.

  		When 'hidden' is not set, and the 'autowrite' option is set,

  		modified buffers are written.  Otherwise, windows that have

  		buffers that are modified are not removed, unless the [!] is

--- 347,362 ----

  <		This will edit "Makefile", and hide the current buffer if it

  		has any changes.

+ :on[ly][!]

+ :{count}on[ly][!]

  CTRL-W o						*CTRL-W_o* *E445*

  CTRL-W CTRL-O					*CTRL-W_CTRL-O* *:on* *:only*

! 		Make the current window the only one on the screen.  All other

! 		windows are closed.  For {count} see |:quit| command.

! 		

  		When the 'hidden' option is set, all buffers in closed windows

  		become hidden.

+ 		

  		When 'hidden' is not set, and the 'autowrite' option is set,

  		modified buffers are written.  Otherwise, windows that have

  		buffers that are modified are not removed, unless the [!] is

*** ../vim-7.4.529/src/Makefile	2014-11-12 15:45:16.591789174 +0100

--- src/Makefile	2014-11-27 14:23:18.260995560 +0100

***************

*** 1890,1899 ****

  	done

  # Run individual test, assuming that Vim was already compiled.

! test1 test2 test3 test4 test5 test6 test7 test8 test9 \

  	test_autoformat_join \

  	test_breakindent \

  	test_changelist \

  	test_eval \

  	test_insertcount \

  	test_listlbr \

--- 1890,1901 ----

  	done

  # Run individual test, assuming that Vim was already compiled.

! test1 \

! 	test_argument_count \

  	test_autoformat_join \

  	test_breakindent \

  	test_changelist \

+ 	test_close_count \

  	test_eval \

  	test_insertcount \

  	test_listlbr \

***************

*** 1904,1909 ****

--- 1906,1912 ----

  	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 \

*** ../vim-7.4.529/src/ex_cmds.h	2014-10-21 20:01:54.986287762 +0200

--- src/ex_cmds.h	2014-11-27 14:56:55.146781659 +0100

***************

*** 58,63 ****

--- 58,71 ----

  #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,80 ****

  # undef EX	    /* just in case */

  #endif

  #ifdef DO_DECLARE_EXCMD

! # define EX(a, b, c, d)  {(char_u *)b, c, (long_u)(d)}

  typedef void (*ex_func_T) __ARGS((exarg_T *eap));

--- 82,88 ----

  # 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}

  typedef void (*ex_func_T) __ARGS((exarg_T *eap));

***************

*** 83,1146 ****

      char_u	*cmd_name;	/* name of the command */

      ex_func_T   cmd_func;	/* function for this command */

      long_u	cmd_argt;	/* flags declared above */

  }

  # if defined(FEAT_GUI_W16)

  _far

  # endif

  cmdnames[] =

  #else

! # define EX(a, b, c, d)  a

  enum CMD_index

  #endif

  {

  EX(CMD_append,		"append",	ex_append,

! 			BANG|RANGE|ZEROR|TRLBAR|CMDWIN|MODIFY),

  EX(CMD_abbreviate,	"abbreviate",	ex_abbreviate,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_abclear,		"abclear",	ex_abclear,

! 			EXTRA|TRLBAR|CMDWIN),

  EX(CMD_aboveleft,	"aboveleft",	ex_wrongmodifier,

! 			NEEDARG|EXTRA|NOTRLCOM),

  EX(CMD_all,		"all",		ex_all,

! 			BANG|RANGE|NOTADR|COUNT|TRLBAR),

  EX(CMD_amenu,		"amenu",	ex_menu,

! 			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_anoremenu,	"anoremenu",	ex_menu,

! 			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_args,		"args",		ex_args,

! 			BANG|FILES|EDITCMD|ARGOPT|TRLBAR),

  EX(CMD_argadd,		"argadd",	ex_argadd,

! 			BANG|NEEDARG|RANGE|NOTADR|ZEROR|FILES|TRLBAR),

  EX(CMD_argdelete,	"argdelete",	ex_argdelete,

! 			BANG|RANGE|NOTADR|FILES|TRLBAR),

  EX(CMD_argdo,		"argdo",	ex_listdo,

! 			BANG|NEEDARG|EXTRA|NOTRLCOM),

  EX(CMD_argedit,		"argedit",	ex_argedit,

! 			BANG|NEEDARG|RANGE|NOTADR|FILE1|EDITCMD|ARGOPT|TRLBAR),

  EX(CMD_argglobal,	"argglobal",	ex_args,

! 			BANG|FILES|EDITCMD|ARGOPT|TRLBAR),

  EX(CMD_arglocal,	"arglocal",	ex_args,

! 			BANG|FILES|EDITCMD|ARGOPT|TRLBAR),

  EX(CMD_argument,	"argument",	ex_argument,

! 			BANG|RANGE|NOTADR|COUNT|EXTRA|EDITCMD|ARGOPT|TRLBAR),

  EX(CMD_ascii,		"ascii",	do_ascii,

! 			TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_autocmd,		"autocmd",	ex_autocmd,

! 			BANG|EXTRA|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_augroup,		"augroup",	ex_autocmd,

! 			BANG|WORD1|TRLBAR|CMDWIN),

  EX(CMD_aunmenu,		"aunmenu",	ex_menu,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_buffer,		"buffer",	ex_buffer,

! 			BANG|RANGE|NOTADR|BUFNAME|BUFUNL|COUNT|EXTRA|EDITCMD|TRLBAR),

  EX(CMD_bNext,		"bNext",	ex_bprevious,

! 			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR),

  EX(CMD_ball,		"ball",		ex_buffer_all,

! 			RANGE|NOTADR|COUNT|TRLBAR),

  EX(CMD_badd,		"badd",		ex_edit,

! 			NEEDARG|FILE1|EDITCMD|TRLBAR|CMDWIN),

  EX(CMD_bdelete,		"bdelete",	ex_bunload,

! 			BANG|RANGE|NOTADR|BUFNAME|COUNT|EXTRA|TRLBAR),

  EX(CMD_behave,		"behave",	ex_behave,

! 			NEEDARG|WORD1|TRLBAR|CMDWIN),

  EX(CMD_belowright,	"belowright",	ex_wrongmodifier,

! 			NEEDARG|EXTRA|NOTRLCOM),

  EX(CMD_bfirst,		"bfirst",	ex_brewind,

! 			BANG|RANGE|NOTADR|EDITCMD|TRLBAR),

  EX(CMD_blast,		"blast",	ex_blast,

! 			BANG|RANGE|NOTADR|EDITCMD|TRLBAR),

  EX(CMD_bmodified,	"bmodified",	ex_bmodified,

! 			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR),

  EX(CMD_bnext,		"bnext",	ex_bnext,

! 			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR),

  EX(CMD_botright,	"botright",	ex_wrongmodifier,

! 			NEEDARG|EXTRA|NOTRLCOM),

  EX(CMD_bprevious,	"bprevious",	ex_bprevious,

! 			BANG|RANGE|NOTADR|COUNT|EDITCMD|TRLBAR),

  EX(CMD_brewind,		"brewind",	ex_brewind,

! 			BANG|RANGE|NOTADR|EDITCMD|TRLBAR),

  EX(CMD_break,		"break",	ex_break,

! 			TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_breakadd,	"breakadd",	ex_breakadd,

! 			EXTRA|TRLBAR|CMDWIN),

  EX(CMD_breakdel,	"breakdel",	ex_breakdel,

! 			EXTRA|TRLBAR|CMDWIN),

  EX(CMD_breaklist,	"breaklist",	ex_breaklist,

! 			EXTRA|TRLBAR|CMDWIN),

  EX(CMD_browse,		"browse",	ex_wrongmodifier,

! 			NEEDARG|EXTRA|NOTRLCOM|CMDWIN),

  EX(CMD_buffers,		"buffers",	buflist_list,

! 			BANG|TRLBAR|CMDWIN),

  EX(CMD_bufdo,		"bufdo",	ex_listdo,

! 			BANG|NEEDARG|EXTRA|NOTRLCOM),

  EX(CMD_bunload,		"bunload",	ex_bunload,

! 			BANG|RANGE|NOTADR|BUFNAME|COUNT|EXTRA|TRLBAR),

  EX(CMD_bwipeout,	"bwipeout",	ex_bunload,

! 			BANG|RANGE|NOTADR|BUFNAME|BUFUNL|COUNT|EXTRA|TRLBAR),

  EX(CMD_change,		"change",	ex_change,

! 			BANG|WHOLEFOLD|RANGE|COUNT|TRLBAR|CMDWIN|MODIFY),

  EX(CMD_cNext,		"cNext",	ex_cnext,

! 			RANGE|NOTADR|COUNT|TRLBAR|BANG),

  EX(CMD_cNfile,		"cNfile",	ex_cnext,

! 			RANGE|NOTADR|COUNT|TRLBAR|BANG),

  EX(CMD_cabbrev,		"cabbrev",	ex_abbreviate,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_cabclear,	"cabclear",	ex_abclear,

! 			EXTRA|TRLBAR|CMDWIN),

  EX(CMD_caddbuffer,	"caddbuffer",	ex_cbuffer,

! 			RANGE|NOTADR|WORD1|TRLBAR),

  EX(CMD_caddexpr,	"caddexpr",	ex_cexpr,

! 			NEEDARG|WORD1|NOTRLCOM|TRLBAR),

  EX(CMD_caddfile,	"caddfile",	ex_cfile,

! 			TRLBAR|FILE1),

  EX(CMD_call,		"call",		ex_call,

! 			RANGE|NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN),

  EX(CMD_catch,		"catch",	ex_catch,

! 			EXTRA|SBOXOK|CMDWIN),

  EX(CMD_cbuffer,		"cbuffer",	ex_cbuffer,

! 			BANG|RANGE|NOTADR|WORD1|TRLBAR),

  EX(CMD_cc,		"cc",		ex_cc,

! 			RANGE|NOTADR|COUNT|TRLBAR|BANG),

  EX(CMD_cclose,		"cclose",	ex_cclose,

! 			RANGE|NOTADR|COUNT|TRLBAR),

  EX(CMD_cd,		"cd",		ex_cd,

! 			BANG|FILE1|TRLBAR|CMDWIN),

  EX(CMD_center,		"center",	ex_align,

! 			TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY),

  EX(CMD_cexpr,		"cexpr",	ex_cexpr,

! 			NEEDARG|WORD1|NOTRLCOM|TRLBAR|BANG),

  EX(CMD_cfile,		"cfile",	ex_cfile,

! 			TRLBAR|FILE1|BANG),

  EX(CMD_cfirst,		"cfirst",	ex_cc,

! 			RANGE|NOTADR|COUNT|TRLBAR|BANG),

  EX(CMD_cgetfile,	"cgetfile",	ex_cfile,

! 			TRLBAR|FILE1),

  EX(CMD_cgetbuffer,	"cgetbuffer",	ex_cbuffer,

! 			RANGE|NOTADR|WORD1|TRLBAR),

  EX(CMD_cgetexpr,	"cgetexpr",	ex_cexpr,

! 			NEEDARG|WORD1|NOTRLCOM|TRLBAR),

  EX(CMD_chdir,		"chdir",	ex_cd,

! 			BANG|FILE1|TRLBAR|CMDWIN),

  EX(CMD_changes,		"changes",	ex_changes,

! 			TRLBAR|CMDWIN),

  EX(CMD_checkpath,	"checkpath",	ex_checkpath,

! 			TRLBAR|BANG|CMDWIN),

  EX(CMD_checktime,	"checktime",	ex_checktime,

! 			RANGE|NOTADR|BUFNAME|COUNT|EXTRA|TRLBAR),

  EX(CMD_clist,		"clist",	qf_list,

! 			BANG|EXTRA|TRLBAR|CMDWIN),

  EX(CMD_clast,		"clast",	ex_cc,

! 			RANGE|NOTADR|COUNT|TRLBAR|BANG),

  EX(CMD_close,		"close",	ex_close,

! 			BANG|TRLBAR|CMDWIN),

  EX(CMD_cmap,		"cmap",		ex_map,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_cmapclear,	"cmapclear",	ex_mapclear,

! 			EXTRA|TRLBAR|CMDWIN),

  EX(CMD_cmenu,		"cmenu",	ex_menu,

! 			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_cnext,		"cnext",	ex_cnext,

! 			RANGE|NOTADR|COUNT|TRLBAR|BANG),

  EX(CMD_cnewer,		"cnewer",	qf_age,

! 			RANGE|NOTADR|COUNT|TRLBAR),

  EX(CMD_cnfile,		"cnfile",	ex_cnext,

! 			RANGE|NOTADR|COUNT|TRLBAR|BANG),

  EX(CMD_cnoremap,	"cnoremap",	ex_map,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_cnoreabbrev,	"cnoreabbrev",	ex_abbreviate,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_cnoremenu,	"cnoremenu",	ex_menu,

! 			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_copy,		"copy",		ex_copymove,

! 			RANGE|WHOLEFOLD|EXTRA|TRLBAR|CMDWIN|MODIFY),

  EX(CMD_colder,		"colder",	qf_age,

! 			RANGE|NOTADR|COUNT|TRLBAR),

  EX(CMD_colorscheme,	"colorscheme",	ex_colorscheme,

! 			WORD1|TRLBAR|CMDWIN),

  EX(CMD_command,		"command",	ex_command,

! 			EXTRA|BANG|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_comclear,	"comclear",	ex_comclear,

! 			TRLBAR|CMDWIN),

  EX(CMD_compiler,	"compiler",	ex_compiler,

! 			BANG|TRLBAR|WORD1|CMDWIN),

  EX(CMD_continue,	"continue",	ex_continue,

! 			TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_confirm,		"confirm",	ex_wrongmodifier,

! 			NEEDARG|EXTRA|NOTRLCOM|CMDWIN),

  EX(CMD_copen,		"copen",	ex_copen,

! 			RANGE|NOTADR|COUNT|TRLBAR),

  EX(CMD_cprevious,	"cprevious",	ex_cnext,

! 			RANGE|NOTADR|COUNT|TRLBAR|BANG),

  EX(CMD_cpfile,		"cpfile",	ex_cnext,

! 			RANGE|NOTADR|COUNT|TRLBAR|BANG),

  EX(CMD_cquit,		"cquit",	ex_cquit,

! 			TRLBAR|BANG),

  EX(CMD_crewind,		"crewind",	ex_cc,

! 			RANGE|NOTADR|COUNT|TRLBAR|BANG),

  EX(CMD_cscope,		"cscope",	do_cscope,

! 			EXTRA|NOTRLCOM|XFILE),

  EX(CMD_cstag,		"cstag",	do_cstag,

! 			BANG|TRLBAR|WORD1),

  EX(CMD_cunmap,		"cunmap",	ex_unmap,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_cunabbrev,	"cunabbrev",	ex_abbreviate,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_cunmenu,		"cunmenu",	ex_menu,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_cwindow,		"cwindow",	ex_cwindow,

! 			RANGE|NOTADR|COUNT|TRLBAR),

  EX(CMD_delete,		"delete",	ex_operators,

! 			RANGE|WHOLEFOLD|REGSTR|COUNT|TRLBAR|CMDWIN|MODIFY),

  EX(CMD_delmarks,	"delmarks",	ex_delmarks,

! 			BANG|EXTRA|TRLBAR|CMDWIN),

  EX(CMD_debug,		"debug",	ex_debug,

! 			NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN),

  EX(CMD_debuggreedy,	"debuggreedy",	ex_debuggreedy,

! 			RANGE|NOTADR|ZEROR|TRLBAR|CMDWIN),

  EX(CMD_delcommand,	"delcommand",	ex_delcommand,

! 			NEEDARG|WORD1|TRLBAR|CMDWIN),

  EX(CMD_delfunction,	"delfunction",	ex_delfunction,

! 			NEEDARG|WORD1|CMDWIN),

  EX(CMD_display,		"display",	ex_display,

! 			EXTRA|NOTRLCOM|TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_diffupdate,	"diffupdate",	ex_diffupdate,

! 			BANG|TRLBAR),

  EX(CMD_diffget,		"diffget",	ex_diffgetput,

! 			RANGE|EXTRA|TRLBAR|MODIFY),

  EX(CMD_diffoff,		"diffoff",	ex_diffoff,

! 			BANG|TRLBAR),

  EX(CMD_diffpatch,	"diffpatch",	ex_diffpatch,

! 			EXTRA|FILE1|TRLBAR|MODIFY),

  EX(CMD_diffput,		"diffput",	ex_diffgetput,

! 			RANGE|EXTRA|TRLBAR),

  EX(CMD_diffsplit,	"diffsplit",	ex_diffsplit,

! 			EXTRA|FILE1|TRLBAR),

  EX(CMD_diffthis,	"diffthis",	ex_diffthis,

! 			TRLBAR),

  EX(CMD_digraphs,	"digraphs",	ex_digraphs,

! 			EXTRA|TRLBAR|CMDWIN),

  EX(CMD_djump,		"djump",	ex_findpat,

! 			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA),

  EX(CMD_dlist,		"dlist",	ex_findpat,

! 			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN),

  EX(CMD_doautocmd,	"doautocmd",	ex_doautocmd,

! 			EXTRA|TRLBAR|CMDWIN),

  EX(CMD_doautoall,	"doautoall",	ex_doautoall,

! 			EXTRA|TRLBAR|CMDWIN),

  EX(CMD_drop,		"drop",		ex_drop,

! 			FILES|EDITCMD|NEEDARG|ARGOPT|TRLBAR),

  EX(CMD_dsearch,		"dsearch",	ex_findpat,

! 			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN),

  EX(CMD_dsplit,		"dsplit",	ex_findpat,

! 			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA),

  EX(CMD_edit,		"edit",		ex_edit,

! 			BANG|FILE1|EDITCMD|ARGOPT|TRLBAR),

  EX(CMD_earlier,		"earlier",	ex_later,

! 			TRLBAR|EXTRA|NOSPC|CMDWIN),

  EX(CMD_echo,		"echo",		ex_echo,

! 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),

  EX(CMD_echoerr,		"echoerr",	ex_execute,

! 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),

  EX(CMD_echohl,		"echohl",	ex_echohl,

! 			EXTRA|TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_echomsg,		"echomsg",	ex_execute,

! 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),

  EX(CMD_echon,		"echon",	ex_echo,

! 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),

  EX(CMD_else,		"else",		ex_else,

! 			TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_elseif,		"elseif",	ex_else,

! 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),

  EX(CMD_emenu,		"emenu",	ex_emenu,

! 			NEEDARG|EXTRA|TRLBAR|NOTRLCOM|RANGE|NOTADR|CMDWIN),

  EX(CMD_endif,		"endif",	ex_endif,

! 			TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_endfunction,	"endfunction",	ex_endfunction,

! 			TRLBAR|CMDWIN),

  EX(CMD_endfor,		"endfor",	ex_endwhile,

! 			TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_endtry,		"endtry",	ex_endtry,

! 			TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_endwhile,	"endwhile",	ex_endwhile,

! 			TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_enew,		"enew",		ex_edit,

! 			BANG|TRLBAR),

  EX(CMD_ex,		"ex",		ex_edit,

! 			BANG|FILE1|EDITCMD|ARGOPT|TRLBAR),

  EX(CMD_execute,		"execute",	ex_execute,

! 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),

  EX(CMD_exit,		"exit",		ex_exit,

! 			RANGE|WHOLEFOLD|BANG|FILE1|ARGOPT|DFLALL|TRLBAR|CMDWIN),

  EX(CMD_exusage,		"exusage",	ex_exusage,

! 			TRLBAR),

  EX(CMD_file,		"file",		ex_file,

! 			RANGE|NOTADR|ZEROR|BANG|FILE1|TRLBAR),

  EX(CMD_files,		"files",	buflist_list,

! 			BANG|TRLBAR|CMDWIN),

  EX(CMD_filetype,	"filetype",	ex_filetype,

! 			EXTRA|TRLBAR|CMDWIN),

  EX(CMD_find,		"find",		ex_find,

! 			RANGE|NOTADR|BANG|FILE1|EDITCMD|ARGOPT|TRLBAR),

  EX(CMD_finally,		"finally",	ex_finally,

! 			TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_finish,		"finish",	ex_finish,

! 			TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_first,		"first",	ex_rewind,

! 			EXTRA|BANG|EDITCMD|ARGOPT|TRLBAR),

  EX(CMD_fixdel,		"fixdel",	do_fixdel,

! 			TRLBAR|CMDWIN),

  EX(CMD_fold,		"fold",		ex_fold,

! 			RANGE|WHOLEFOLD|TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_foldclose,	"foldclose",	ex_foldopen,

! 			RANGE|BANG|WHOLEFOLD|TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_folddoopen,	"folddoopen",	ex_folddo,

! 			RANGE|DFLALL|NEEDARG|EXTRA|NOTRLCOM),

  EX(CMD_folddoclosed,	"folddoclosed",	ex_folddo,

! 			RANGE|DFLALL|NEEDARG|EXTRA|NOTRLCOM),

  EX(CMD_foldopen,	"foldopen",	ex_foldopen,

! 			RANGE|BANG|WHOLEFOLD|TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_for,		"for",		ex_while,

! 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),

  EX(CMD_function,	"function",	ex_function,

! 			EXTRA|BANG|CMDWIN),

  EX(CMD_global,		"global",	ex_global,

! 			RANGE|WHOLEFOLD|BANG|EXTRA|DFLALL|SBOXOK|CMDWIN),

  EX(CMD_goto,		"goto",		ex_goto,

! 			RANGE|NOTADR|COUNT|TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_grep,		"grep",		ex_make,

! 			RANGE|NOTADR|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE),

  EX(CMD_grepadd,		"grepadd",	ex_make,

! 			RANGE|NOTADR|BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE),

  EX(CMD_gui,		"gui",		ex_gui,

! 			BANG|FILES|EDITCMD|ARGOPT|TRLBAR|CMDWIN),

  EX(CMD_gvim,		"gvim",		ex_gui,

! 			BANG|FILES|EDITCMD|ARGOPT|TRLBAR|CMDWIN),

  EX(CMD_help,		"help",		ex_help,

! 			BANG|EXTRA|NOTRLCOM),

  EX(CMD_helpclose,	"helpclose",	ex_helpclose,

! 			RANGE|NOTADR|COUNT|TRLBAR),

  EX(CMD_helpfind,	"helpfind",	ex_helpfind,

! 			EXTRA|NOTRLCOM),

  EX(CMD_helpgrep,	"helpgrep",	ex_helpgrep,

! 			EXTRA|NOTRLCOM|NEEDARG),

  EX(CMD_helptags,	"helptags",	ex_helptags,

! 			NEEDARG|FILES|TRLBAR|CMDWIN),

  EX(CMD_hardcopy,	"hardcopy",	ex_hardcopy,

! 			RANGE|COUNT|EXTRA|TRLBAR|DFLALL|BANG),

  EX(CMD_highlight,	"highlight",	ex_highlight,

! 			BANG|EXTRA|TRLBAR|SBOXOK|CMDWIN),

  EX(CMD_hide,		"hide",		ex_hide,

! 			BANG|EXTRA|NOTRLCOM),

  EX(CMD_history,		"history",	ex_history,

! 			EXTRA|TRLBAR|CMDWIN),

  EX(CMD_insert,		"insert",	ex_append,

! 			BANG|RANGE|TRLBAR|CMDWIN|MODIFY),

  EX(CMD_iabbrev,		"iabbrev",	ex_abbreviate,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_iabclear,	"iabclear",	ex_abclear,

! 			EXTRA|TRLBAR|CMDWIN),

  EX(CMD_if,		"if",		ex_if,

! 			EXTRA|NOTRLCOM|SBOXOK|CMDWIN),

  EX(CMD_ijump,		"ijump",	ex_findpat,

! 			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA),

  EX(CMD_ilist,		"ilist",	ex_findpat,

! 			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN),

  EX(CMD_imap,		"imap",		ex_map,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_imapclear,	"imapclear",	ex_mapclear,

! 			EXTRA|TRLBAR|CMDWIN),

  EX(CMD_imenu,		"imenu",	ex_menu,

! 			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_inoremap,	"inoremap",	ex_map,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_inoreabbrev,	"inoreabbrev",	ex_abbreviate,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_inoremenu,	"inoremenu",	ex_menu,

! 			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_intro,		"intro",	ex_intro,

! 			TRLBAR|CMDWIN),

  EX(CMD_isearch,		"isearch",	ex_findpat,

! 			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA|CMDWIN),

  EX(CMD_isplit,		"isplit",	ex_findpat,

! 			BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA),

  EX(CMD_iunmap,		"iunmap",	ex_unmap,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_iunabbrev,	"iunabbrev",	ex_abbreviate,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_iunmenu,		"iunmenu",	ex_menu,

! 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),

  EX(CMD_join,		"join",		ex_join,

! 			BANG|RANGE|WHOLEFOLD|COUNT|EXFLAGS|TRLBAR|CMDWIN|MODIFY),

  EX(CMD_jumps,		"jumps",	ex_jumps,

! 			TRLBAR|CMDWIN),

  EX(CMD_k,		"k",		ex_mark,