docs: cleanup tables, highlights.scm #42381

highlights.scm: `#match` is slow, prefer `#lua-match`.

37 files changed, 518 insertions, 529 deletions

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 72ebb9e215..f8a4ceb137 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -111,7 +111,7 @@ typedefs around C99 standard types, others are Nvim-defined data structures.
 Basic types ~
 
   API Type				C type ~
-  Nil
+  Nil					 
   Boolean				bool
   Integer (signed 64-bit integer)	int64_t
   Float (IEEE 754 double precision)	double
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index b6dfb50a5b..a648a1916b 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -799,38 +799,38 @@ The substitution is limited in recursion to 4 levels. *E1290*
 
 Otherwise these characters in {string} have a special meaning:
 
-magic	nomagic	  action    ~
-  &	  \&	  replaced with the whole matched pattern	     *s/\&*
- \&	   &	  replaced with &
-      \0	  replaced with the whole matched pattern	   *\0* *s/\0*
-      \1	  replaced with the matched pattern in the first
-		  pair of ()					     *s/\1*
-      \2	  replaced with the matched pattern in the second
-		  pair of ()					     *s/\2*
-      ..	  ..						     *s/\3*
-      \9	  replaced with the matched pattern in the ninth
-		  pair of ()					     *s/\9*
-  ~	  \~	  replaced with the {string} of the previous
-		  substitute					     *s~*
- \~	   ~	  replaced with ~				     *s/\~*
-      \u	  next character made uppercase			     *s/\u*
-      \U	  following characters made uppercase, until \E      *s/\U*
-      \l	  next character made lowercase			     *s/\l*
-      \L	  following characters made lowercase, until \E      *s/\L*
-      \e	  end of \u, \U, \l and \L (NOTE: not <Esc>!)	     *s/\e*
-      \E	  end of \u, \U, \l and \L			     *s/\E*
-      <CR>	  split line in two at this point
-		  (Type the <CR> as CTRL-V <Enter>)		     *s<CR>*
-      \r	  idem						     *s/\r*
-      \<CR>	  insert a carriage-return (CTRL-M)
-		  (Type the <CR> as CTRL-V <Enter>)		     *s/\<CR>*
-      \n	  insert a <NL> (<NUL> in the file)
-		  (does NOT break the line)			     *s/\n*
-      \b	  insert a <BS>					     *s/\b*
-      \t	  insert a <Tab>				     *s/\t*
-      \\	  insert a single backslash			     *s/\\*
-      \x	  where x is any character not mentioned above:
-		  Reserved for future expansion
+ 		magic	nomagic	action ~
+*s/\&*		&	\&	replaced with the whole matched pattern
+ 		\&	&	replaced with &
+*\0* *s/\0*	\0	\0	replaced with the whole matched pattern
+*s/\1*		\1	\1	replaced with the matched pattern in the first
+				pair of ()
+*s/\2*		\2	\2	replaced with the matched pattern in the second
+				pair of ()
+*s/\3*		..	..	..
+*s/\9*		\9	\9	replaced with the matched pattern in the ninth
+				pair of ()
+*s~*		~	\~	replaced with the {string} of the previous
+				substitute
+*s/\~*		\~	~	replaced with ~
+*s/\u*		\u	\u	next character made uppercase
+*s/\U*		\U	\U	following characters made uppercase, until \E
+*s/\l*		\l	\l	next character made lowercase
+*s/\L*		\L	\L	following characters made lowercase, until \E
+*s/\e*		\e	\e	end of \u, \U, \l and \L (NOTE: not <Esc>!)
+*s/\E*		\E	\E	end of \u, \U, \l and \L
+*s<CR>*		<CR>	<CR>	split line in two at this point
+				(Type the <CR> as CTRL-V <Enter>)
+*s/\r*		\r	\r	idem
+*s/\<CR>*	\<CR>	\<CR>	insert a carriage-return (CTRL-M)
+				(Type the <CR> as CTRL-V <Enter>)
+*s/\n*		\n	\n	insert a <NL> (<NUL> in the file)
+				(does NOT break the line)
+*s/\b*		\b	\b	insert a <BS>
+*s/\t*		\t	\t	insert a <Tab>
+*s/\\*		\\	\\	insert a single backslash
+ 		\x	\x	where x is any character not mentioned above:
+				Reserved for future expansion
 
 The special meaning is also used inside the third argument {sub} of
 the |substitute()| function with the following exceptions:
@@ -1670,7 +1670,7 @@ You can use the 'formatoptions' option  to influence how Vim formats text.
 'formatoptions' is a string that can contain any of the letters below.  You
 can separate the option letters with commas for readability.
 
-letter	 meaning when present in 'formatoptions'    ~
+letter   meaning when present in 'formatoptions'    ~
 							*fo-t*
 t	Auto-wrap text using 'textwidth'
 							*fo-c*
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index e7bf1ad8f3..c79510a981 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -135,7 +135,7 @@ When the same extension is used for multiple filetypes, Vim tries to guess
 what kind of file it is.  This doesn't always work.  A number of global
 variables can be used to overrule the filetype used for certain extensions:
 
-	file name	variable ~
+	file name	variable		  ~
 	`*.al`		g:filetype_al
 	`*.app`		g:filetype_app
 	`*.as`		g:filetype_as
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 19efda949b..80d0dfdad7 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -169,63 +169,58 @@ Overview of what the mouse buttons do, when 'mousemodel' is "extend":
 
                *<S-LeftMouse>* *<A-RightMouse>* *<S-RightMouse>* *<RightDrag>*
                                                  *<RightRelease>* *<LeftDrag>*
-Normal Mode: >
-  event         position     selection        change  action
-                 cursor                       window
-  ---------------------------------------------------------------------------
-  <LeftMouse>     yes          end              yes
-  <C-LeftMouse>   no        no change           no     toggle multicursor
-  <S-LeftMouse>   yes       no change           yes    "*" (2)
-  <LeftDrag>      yes     start or extend (1)   no
-  <LeftRelease>   yes     start or extend (1)   no
-  <MiddleMouse>   yes       if not active       no     put
-  <MiddleMouse>   yes       if active           no     yank and put
-  <RightMouse>    yes     start or extend       yes
-  <A-RightMouse>  yes start or extend blockw.   yes
-  <S-RightMouse>  yes        no change          yes    "#" (2)
-  <C-RightMouse>  no         no change          no     "CTRL-T"
-  <RightDrag>     yes         extend            no
-  <RightRelease>  yes         extend            no
-
-Insert or Replace Mode: >
-  event         position     selection        change  action
-                 cursor                       window
-  ---------------------------------------------------------------------------
-  <LeftMouse>     yes     (cannot be active)    yes
-  <C-LeftMouse>   no      (cannot be active)    no     no-op
-  <S-LeftMouse>   yes     (cannot be active)    yes    "CTRL-O*" (2)
-  <LeftDrag>      yes     start or extend (1)   no     like CTRL-O (1)
-  <LeftRelease>   yes     start or extend (1)   no     like CTRL-O (1)
-  <MiddleMouse>   no      (cannot be active)    no     put register
-  <RightMouse>    yes     start or extend       yes    like CTRL-O
-  <A-RightMouse>  yes start or extend blockw.   yes
-  <S-RightMouse>  yes     (cannot be active)    yes    "CTRL-O#" (2)
-  <C-RightMouse>  no      (cannot be active)    no     "CTRL-O CTRL-T"
-
-In a help window: >
-  event         position     selection        change  action
-                 cursor                       window
-  ---------------------------------------------------------------------------
-  <2-LeftMouse>   yes     (cannot be active)    no     "^]" (jump to help tag)
+Normal Mode:
+
+  event		position cursor	selection	  change window	action ~
+  <LeftMouse>		yes	end			yes
+  <C-LeftMouse>		no	no change		no	toggle multicursor
+  <S-LeftMouse>		yes	no change		yes	"*" (2)
+  <LeftDrag>		yes	start or extend (1)	no
+  <LeftRelease>		yes	start or extend (1)	no
+  <MiddleMouse>		yes	if not active		no	put
+  <MiddleMouse>		yes	if active		no	yank and put
+  <RightMouse>		yes	start or extend		yes
+  <A-RightMouse>	yes	start or extend blockw.	yes
+  <S-RightMouse>	yes	no change		yes	"#" (2)
+  <C-RightMouse>	no	no change		no	"CTRL-T"
+  <RightDrag>		yes	extend			no
+  <RightRelease>	yes	extend			no
+
+Insert or Replace Mode:
+
+  event		position cursor	selection	  change window	action ~
+  <LeftMouse>		yes	(cannot be active)	yes
+  <C-LeftMouse>		no	(cannot be active)	no	no-op
+  <S-LeftMouse>		yes	(cannot be active)	yes	"CTRL-O*" (2)
+  <LeftDrag>		yes	start or extend (1)	no	like CTRL-O (1)
+  <LeftRelease>		yes	start or extend (1)	no	like CTRL-O (1)
+  <MiddleMouse>		no	(cannot be active)	no	put register
+  <RightMouse>		yes	start or extend		yes	like CTRL-O
+  <A-RightMouse>	yes	start or extend blockw.	yes
+  <S-RightMouse>	yes	(cannot be active)	yes	"CTRL-O#" (2)
+  <C-RightMouse>	no	(cannot be active)	no	"CTRL-O CTRL-T"
+
+In a help window:
+
+  event		position cursor	selection	  change window	action ~
+  <2-LeftMouse>		yes	(cannot be active)	no	"^]" (jump to help tag)
 
 When 'mousemodel' is "popup", these are different:
 
                                                                *<A-LeftMouse>*
-Normal Mode: >
-  event         position     selection        change  action
-                 cursor                       window
-  ---------------------------------------------------------------------------
-  <S-LeftMouse>   yes     start or extend (1)   no
-  <A-LeftMouse>   yes     start/extend blockw   no
-  <RightMouse>    no      popup menu            no
-
-Insert or Replace Mode: >
-  event         position     selection        change  action
-                 cursor                       window
-  ---------------------------------------------------------------------------
-  <S-LeftMouse>   yes     start or extend (1)   no     like CTRL-O (1)
-  <A-LeftMouse>   yes     start/extend blockw   no
-  <RightMouse>    no      popup menu            no
+Normal Mode:
+
+  event		position cursor	selection	  change window	action ~
+  <S-LeftMouse>		yes	start or extend (1)	no
+  <A-LeftMouse>		yes	start/extend blockw	no
+  <RightMouse>		no	popup menu		no
+
+Insert or Replace Mode:
+
+  event		position cursor	selection	  change window	action ~
+  <S-LeftMouse>		yes	start or extend (1)	no	like CTRL-O (1)
+  <A-LeftMouse>		yes	start/extend blockw	no
+  <RightMouse>		no	popup menu		no
 
 (1) only if mouse pointer moved since press
 (2) only if click is in same buffer
@@ -257,13 +252,12 @@ alt key is pressed (it may move the window).
 
                 *double-click* *<2-LeftMouse>* *<3-LeftMouse>* *<4-LeftMouse>*
 Double, triple and quadruple clicks are supported.  For selecting text, extra
-clicks extend the selection: >
+clicks extend the selection:
 
-        click           select
-        ---------------------------------
-        double          word or % match
-        triple          line
-        quadruple       rectangular block
+	click		select ~
+	double		word or % match
+	triple		line
+	quadruple	rectangular block
 
 Exception: In a :help window, double-click jumps to help for the word that is
 clicked on.
@@ -292,24 +286,24 @@ This is like using CTRL-O in Insert mode.  Select mode is used when the
                                                 *X1Mouse* *X1Drag* *X1Release*
                                                 *X2Mouse* *X2Drag* *X2Release*
                                               *<MiddleRelease>* *<MiddleDrag>*
-Mouse clicks can be mapped using these |keycodes|: >
-      code           mouse button              normal action
-  ---------------------------------------------------------------------------
-  <LeftMouse>     left pressed               set cursor position
-  <LeftDrag>      left moved while pressed   extend selection
-  <LeftRelease>   left released              set selection end
-  <MiddleMouse>   middle pressed             paste text at cursor position
-  <MiddleDrag>    middle moved while pressed -
-  <MiddleRelease> middle released            -
-  <RightMouse>    right pressed              extend selection
-  <RightDrag>     right moved while pressed  extend selection
-  <RightRelease>  right released             set selection end
-  <X1Mouse>       X1 button pressed          -
-  <X1Drag>        X1 moved while pressed     -
-  <X1Release>     X1 button release          -
-  <X2Mouse>       X2 button pressed          -
-  <X2Drag>        X2 moved while pressed     -
-  <X2Release>     X2 button release          -
+Mouse clicks can be mapped using these |keycodes|:
+
+  code			mouse button			normal action ~
+  <LeftMouse>		left pressed			set cursor position
+  <LeftDrag>		left moved while pressed	extend selection
+  <LeftRelease>		left released			set selection end
+  <MiddleMouse>		middle pressed			paste text at cursor position
+  <MiddleDrag>		middle moved while pressed	-
+  <MiddleRelease>	middle released			-
+  <RightMouse>		right pressed			extend selection
+  <RightDrag>		right moved while pressed	extend selection
+  <RightRelease>	right released			set selection end
+  <X1Mouse>		X1 button pressed		-
+  <X1Drag>		X1 moved while pressed		-
+  <X1Release>		X1 button release		-
+  <X2Mouse>		X2 button pressed		-
+  <X2Drag>		X2 moved while pressed		-
+  <X2Release>		X2 button release		-
 
 The X1 and X2 buttons refer to the extra buttons found on some mice (e.g. the
 right thumb).
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 0bfe243ea2..e05575f74a 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -40,14 +40,14 @@ Tag		Char		Insert-mode action	~
 |i_CTRL-G_u|	CTRL-G u	start new undoable edit
 |i_CTRL-G_U|	CTRL-G U	don't break undo with next cursor movement
 |i_<BS>|	<BS>		delete character before the cursor
-|i_digraph|	{char1}<BS>{char2}
+|i_digraph|	{char1}<BS>{char2}	 
 				enter digraph (only when 'digraph' option set)
 |i_CTRL-H|	CTRL-H		same as <BS>
 |i_<Tab>|	<Tab>		insert a <Tab> character
 |i_CTRL-I|	CTRL-I		same as <Tab>
 |i_<NL>|	<NL>		same as <CR>
 |i_CTRL-J|	CTRL-J		same as <CR>
-|i_CTRL-K|	CTRL-K {char1} {char2}
+|i_CTRL-K|	CTRL-K {char1} {char2}	 
 				enter digraph
 |i_<CR>|	<CR>		begin new line
 |i_CTRL-M|	CTRL-M		same as <CR>
@@ -61,7 +61,7 @@ Tag		Char		Insert-mode action	~
 				control flow
 |i_CTRL-SHIFT-Q|  CTRL-SHIFT-Q {char}
 				like CTRL-Q unless |tui-modifyOtherKeys| is active
-|i_CTRL-R|	CTRL-R {register}
+|i_CTRL-R|	CTRL-R {register}	 
 				insert the contents of a register
 |i_CTRL-R_CTRL-R| CTRL-R CTRL-R {register}
 				insert the contents of a register literally
@@ -86,20 +86,25 @@ Tag		Char		Insert-mode action	~
 |i_CTRL-Y|	CTRL-Y		insert the character which is above the cursor
 |i_<Esc>|	<Esc>		end insert mode
 |i_CTRL-[|	CTRL-[		same as <Esc>
-|i_CTRL-\_CTRL-N| CTRL-\ CTRL-N	go to Normal mode
-|i_CTRL-\_CTRL-G| CTRL-\ CTRL-G	go to Normal mode
+|i_CTRL-\_CTRL-N|	CTRL-\ CTRL-N	go to Normal mode
+|i_CTRL-\_CTRL-G|	CTRL-\ CTRL-G	go to Normal mode
  		CTRL-\ a - z	reserved for extensions
  		CTRL-\ others	not used
 |i_CTRL-]|	CTRL-]		trigger abbreviation
 |i_CTRL-^|	CTRL-^		toggle use of |:lmap| mappings
 |i_CTRL-_|	CTRL-_		When 'allowrevins' set: toggle 'revins'
+ -----------------------------------------------------------------------------
  		<Space> to '~'	not used, except '0' and '^' followed by
 				CTRL-D
+ -----------------------------------------------------------------------------
 |i_0_CTRL-D|	0 CTRL-D	delete all indent in the current line
 |i_^_CTRL-D|	^ CTRL-D	delete all indent in the current line, restore
 				it in the next line
+ -----------------------------------------------------------------------------
 |i_<Del>|	<Del>		delete character under the cursor
+ -----------------------------------------------------------------------------
  		Meta characters (0x80 to 0xff, 128 to 255)	not used
+ -----------------------------------------------------------------------------
 |i_<Left>|	<Left>		cursor one character left
 |i_<S-Left>|	<S-Left>	cursor one word left
 |i_<C-Left>|	<C-Left>	cursor one word left
@@ -127,7 +132,7 @@ Tag		Char		Insert-mode action	~
 |i_<ScrollWheelLeft>|	<ScrollWheelLeft>	move window six columns left
 |i_<S-ScrollWheelLeft>|	<S-ScrollWheelLeft>	move window one page left
 |i_<ScrollWheelRight>|	<ScrollWheelRight>	move window six columns right
-|i_<S-ScrollWheelRight>| <S-ScrollWheelRight>	move window one page right
+|i_<S-ScrollWheelRight>|	<S-ScrollWheelRight>	move window one page right
 
 commands in CTRL-X submode				*i_CTRL-X_index*
 
@@ -227,8 +232,9 @@ Tag		Char	      Note Normal-mode action	~
 |CTRL-<Tab>|	CTRL-<Tab>	   same as `g<Tab>` : go to last accessed tab
 				   page
  		CTRL-_		   not used
+ -----------------------------------------------------------------------------
 |<Space>|	<Space>		1  same as "l"
-|!|		!{motion}{filter}
+|!|		!{motion}{filter}	 
 				2  filter Nmove text through the {filter}
 				   command
 |!!|		!!{filter}	2  filter N lines through the {filter} command
@@ -430,7 +436,7 @@ Tag		Char	      Note Normal-mode action	~
 |<C-Left>|	<C-Left>	1  same as "b"
 |<C-LeftMouse>|	<C-LeftMouse>	   place a multicursor at mouse-click
 |<C-Right>|	<C-Right>	1  same as "w"
-|<C-RightMouse>| <C-RightMouse>	   same as "CTRL-T"
+|<C-RightMouse>|	<C-RightMouse>	   same as "CTRL-T"
 |<C-Tab>|	<C-Tab>		   same as "g<Tab>"
 |<Del>|		["x]<Del>	2  same as "x"
 |N<Del>|	{count}<Del>	   remove the last digit from {count}
@@ -452,7 +458,7 @@ Tag		Char	      Note Normal-mode action	~
 |<S-Left>|	<S-Left>	1  same as "b"
 |<S-LeftMouse>|	<S-LeftMouse>	   same as "*" at the mouse click position
 |<S-Right>|	<S-Right>	1  same as "w"
-|<S-RightMouse>| <S-RightMouse>	   same as "#" at the mouse click position
+|<S-RightMouse>|	<S-RightMouse>	   same as "#" at the mouse click position
 |<S-Up>|	<S-Up>		1  same as CTRL-B
 |<Undo>|	<Undo>		2  same as "u"
 |<Up>|		<Up>		1  same as "k"
@@ -607,7 +613,7 @@ Tag		Command		   Normal-mode action	~
 |CTRL-W_<Down>|	CTRL-W <Down>	   same as "CTRL-W j"
 |CTRL-W_<Up>|	CTRL-W <Up>	   same as "CTRL-W k"
 |CTRL-W_<Left>|	CTRL-W <Left>	   same as "CTRL-W h"
-|CTRL-W_<Right>| CTRL-W <Right>	   same as "CTRL-W l"
+|CTRL-W_<Right>|	CTRL-W <Right>	   same as "CTRL-W l"
 
 ==============================================================================
 2.3 Square bracket commands					*[* *]*
@@ -658,7 +664,8 @@ Tag		Char	      Note Normal-mode action	~
 |[s|		[s		1  move to the previous misspelled word
 |[z|		[z		1  move to start of open fold
 |[{|		[{		1  cursor N times back to unmatched '{'
-|[<MiddleMouse>| [<MiddleMouse>	2  same as "[p"
+|[<MiddleMouse>|	[<MiddleMouse>	2  same as "[p"
+ -----------------------------------------------------------------------------
 |]_CTRL-D|	] CTRL-D	   jump to first #define found in current and
 				   included files matching the word under the
 				   cursor, start searching at cursor position
@@ -698,7 +705,7 @@ Tag		Char	      Note Normal-mode action	~
 |]s|		]s		1  move to next misspelled word
 |]z|		]z		1  move to end of open fold
 |]}|		]}		1  cursor N times forward to unmatched '}'
-|]<MiddleMouse>| ]<MiddleMouse>	2  same as "]p"
+|]<MiddleMouse>|	]<MiddleMouse>	2  same as "]p"
 
 ==============================================================================
 2.4 Commands starting with 'g'						*g*
@@ -894,8 +901,8 @@ here are those that are different.
 
 Tag		Command	      Note Visual-mode action	~
 ------------------------------------------------------------------------------ ~
-|v_CTRL-\_CTRL-N| CTRL-\ CTRL-N	   stop Visual mode
-|v_CTRL-\_CTRL-G| CTRL-\ CTRL-G	   go to Normal mode
+|v_CTRL-\_CTRL-N|	CTRL-\ CTRL-N	   stop Visual mode
+|v_CTRL-\_CTRL-G|	CTRL-\ CTRL-G	   go to Normal mode
 |v_CTRL-A|	CTRL-A		2  add N to number in highlighted text
 |v_CTRL-C|	CTRL-C		   stop Visual mode
 |v_CTRL-G|	CTRL-G		   toggle between Visual mode and Select mode
@@ -1027,7 +1034,7 @@ Tag		Command		Command-line editing-mode action	~
 				command-line window; otherwise not used
 |c_CTRL-G|	CTRL-G		next match when 'incsearch' is active
 |c_<BS>|	<BS>		delete the character in front of the cursor
-|c_digraph|	{char1} <BS> {char2}
+|c_digraph|	{char1} <BS> {char2}	 
 				enter digraph when 'digraph' is on
 |c_CTRL-H|	CTRL-H		same as <BS>
 |c_<Tab>|	<Tab>		if 'wildchar' is <Tab>: Do completion on
@@ -1038,7 +1045,7 @@ Tag		Command		Command-line editing-mode action	~
 |c_CTRL-I|	CTRL-I		same as <Tab>
 |c_<NL>|	<NL>		same as <CR>
 |c_CTRL-J|	CTRL-J		same as <CR>
-|c_CTRL-K|	CTRL-K {char1} {char2}
+|c_CTRL-K|	CTRL-K {char1} {char2}	 
 				enter digraph
 |c_CTRL-L|	CTRL-L		do completion on the pattern in front of the
 				cursor and insert the longest common part
@@ -1053,7 +1060,7 @@ Tag		Command		Command-line editing-mode action	~
 				command-line from history.
 |c_CTRL-Q|	CTRL-Q		same as CTRL-V, unless it's used for terminal
 				control flow
-|c_CTRL-R|	CTRL-R {regname}
+|c_CTRL-R|	CTRL-R {regname}	 
 				insert the contents of a register or object
 				under the cursor as if typed
 |c_CTRL-R_CTRL-R| CTRL-R CTRL-R {regname}
@@ -1072,16 +1079,17 @@ Tag		Command		Command-line editing-mode action	~
  		CTRL-Z		not used (reserved for suspend)
 |c_<Esc>|	<Esc>		abandon command-line without executing it
 |c_CTRL-[|	CTRL-[		same as <Esc>
-|c_CTRL-\_CTRL-N| CTRL-\ CTRL-N	go to Normal mode, abandon command-line
-|c_CTRL-\_CTRL-G| CTRL-\ CTRL-G	go to Normal mode, abandon command-line
+|c_CTRL-\_CTRL-N|	CTRL-\ CTRL-N	go to Normal mode, abandon command-line
+|c_CTRL-\_CTRL-G|	CTRL-\ CTRL-G	go to Normal mode, abandon command-line
  		CTRL-\ a - d	reserved for extensions
-|c_CTRL-\_e|	CTRL-\ e {expr} replace the command line with the result of
+|c_CTRL-\_e|	CTRL-\ e {expr}	replace the command line with the result of
 				{expr}
  		CTRL-\ f - z	reserved for extensions
  		CTRL-\ others	not used
 |c_CTRL-]|	CTRL-]		trigger abbreviation
 |c_CTRL-^|	CTRL-^		toggle use of |:lmap| mappings
 |c_<Del>|	<Del>		delete the character under the cursor
+ -----------------------------------------------------------------------------
 |c_<Left>|	<Left>		cursor left
 |c_<S-Left>|	<S-Left>	cursor one word left
 |c_<C-Left>|	<C-Left>	cursor one word left
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 5b5febe2bf..e498c9d000 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -32,8 +32,8 @@ If you are working in a special language mode when inserting text, see the
 'langmap' option, 'langmap', on how to avoid switching this mode on and off
 all the time.
 
-char		action	~
------------------------------------------------------------------------
+char            action  ~
+----------------------------------------------------------------------- ~
 						*i_CTRL-[* *i_<Esc>*
 <Esc> or CTRL-[	End insert or Replace mode, go back to Normal mode.  Finish
 		abbreviation.
@@ -267,7 +267,7 @@ CTRL-]		Trigger abbreviation, without inserting a character.
 						*i_<Insert>*
 <Insert>	Toggle between Insert and Replace mode.
 
------------------------------------------------------------------------
+----------------------------------------------------------------------- ~
 						*i_backspacing*
 The effect of the <BS>, CTRL-W, and CTRL-U depend on the 'backspace' option
 (unless 'revins' is set).  This is a comma-separated list of items:
@@ -292,12 +292,12 @@ With CTRL-V the decimal, octal or hexadecimal value of a character can be
 entered directly.  This way you can enter any character, except a line break
 (<NL>, value 10).  There are five ways to enter the character value:
 
-first char	mode	     max nr of chars   max value ~
-(none)		decimal		   3		255
-o or O		octal		   3		377	 (255)
-x or X		hexadecimal	   2		ff	 (255)
-u		hexadecimal	   4		ffff	 (65535)
-U		hexadecimal	   8		7fffffff (2147483647)
+first char	mode		max nr of chars	max value ~
+(none)		decimal		3		255
+o or O		octal		3		377 (255)
+x or X		hexadecimal	2		ff (255)
+u		hexadecimal	4		ffff (65535)
+U		hexadecimal	8		7fffffff (2147483647)
 
 Normally you would type the maximum number of characters.  Thus to enter a
 space (value 32) you would type <C-V>032.  You can omit the leading zero, in
@@ -351,47 +351,47 @@ including cursor-moves.  After a jump (mouse, scroll, <PageUp>, …) only the
 last change can be redone, and it behaves like an "i" command.  The |quote.|
 register always holds just the text typed after the last cursor-move.
 
-char		action	~
------------------------------------------------------------------------
-<Up>		cursor one line up			     *i_<Up>*
-<Down>		cursor one line down			     *i_<Down>*
+char		action					     tag ~
+----------------------------------------------------------------------- ~
+<Up>		cursor one line up	                     *i_<Up>*
+<Down>		cursor one line down	                     *i_<Down>*
 CTRL-G <Up>	cursor one line up, insert start column	     *i_CTRL-G_<Up>*
 CTRL-G k	cursor one line up, insert start column	     *i_CTRL-G_k*
 CTRL-G CTRL-K	cursor one line up, insert start column	     *i_CTRL-G_CTRL-K*
-CTRL-G <Down>	cursor one line down, insert start column    *i_CTRL-G_<Down>*
-CTRL-G j	cursor one line down, insert start column    *i_CTRL-G_j*
-CTRL-G CTRL-J	cursor one line down, insert start column    *i_CTRL-G_CTRL-J*
-<Left>		cursor one character left		     *i_<Left>*
-<Right>		cursor one character right		     *i_<Right>*
+CTRL-G <Down>	cursor one line down, insert start column	*i_CTRL-G_<Down>*
+CTRL-G j	cursor one line down, insert start column	*i_CTRL-G_j*
+CTRL-G CTRL-J	cursor one line down, insert start column	*i_CTRL-G_CTRL-J*
+<Left>		cursor one character left	             *i_<Left>*
+<Right>		cursor one character right	             *i_<Right>*
 <S-Left>	cursor one word back (like "b" command)	     *i_<S-Left>*
 <C-Left>	cursor one word back (like "b" command)	     *i_<C-Left>*
-<S-Right>	cursor one word forward (like "w" command)   *i_<S-Right>*
-<C-Right>	cursor one word forward (like "w" command)   *i_<C-Right>*
+<S-Right>	cursor one word forward (like "w" command)	*i_<S-Right>*
+<C-Right>	cursor one word forward (like "w" command)	*i_<C-Right>*
 <Home>		cursor to first char in the line	     *i_<Home>*
 <End>		cursor to after last char in the line	     *i_<End>*
 <C-Home>	cursor to first char in the file	     *i_<C-Home>*
 <C-End>		cursor to after last char in the file	     *i_<C-End>*
 <LeftMouse>	cursor to position of mouse click	     *i_<LeftMouse>*
-<S-Up>		move window one page up			     *i_<S-Up>*
-<PageUp>	move window one page up			     *i_<PageUp>*
-<S-Down>	move window one page down		     *i_<S-Down>*
-<PageDown>	move window one page down		     *i_<PageDown>*
-<ScrollWheelDown>    move window three lines down	*i_<ScrollWheelDown>*
-<S-ScrollWheelDown>  move window one page down		*i_<S-ScrollWheelDown>*
-<ScrollWheelUp>      move window three lines up		*i_<ScrollWheelUp>*
-<S-ScrollWheelUp>    move window one page up		*i_<S-ScrollWheelUp>*
-<ScrollWheelLeft>    move window six columns left	*i_<ScrollWheelLeft>*
-<S-ScrollWheelLeft>  move window one page left		*i_<S-ScrollWheelLeft>*
-<ScrollWheelRight>   move window six columns right	*i_<ScrollWheelRight>*
-<S-ScrollWheelRight> move window one page right		*i_<S-ScrollWheelRight>*
-CTRL-O		execute one command, return to Insert mode   *i_CTRL-O*
+<S-Up>		move window one page up	                     *i_<S-Up>*
+<PageUp>	move window one page up	                     *i_<PageUp>*
+<S-Down>	move window one page down	             *i_<S-Down>*
+<PageDown>	move window one page down	             *i_<PageDown>*
+<ScrollWheelDown>	move window three lines down	     *i_<ScrollWheelDown>*
+<S-S