From 34c8b87c25c51521261ef20f49c34b924501890f Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Tue, 5 May 2009 16:47:43 +0000
Subject: [PATCH] generic extension key classes: ext (bash, vim), new (vim7)

---
 base.css        |  12 +--
 readline.inc.pl |  10 +-
 readline.plp    |   2 +
 vim.inc.pl      | 244 ++++++++++++++++++++++++------------------------
 vim.plp         |   4 +-
 5 files changed, 140 insertions(+), 132 deletions(-)

diff --git a/base.css b/base.css
index 2806139..747f759 100644
--- a/base.css
+++ b/base.css
@@ -381,15 +381,13 @@ ul.keys li.ni {
 	padding: 1px; /* same size as borderlessless keys */
 }
 
-dl.legend dt.vim,
-ul.keys li.vim {
+dl.legend dt.ext,
+ul.keys li.ext {
 	border-style: dashed;
-	-moz-border-radius: 0; /* incompatible with border-style */
 }
-dl.legend dt.vim7,
-ul.keys li.vim7 {
-	border-style: dotted;
-	-moz-border-radius: 0;
+dl.legend dt.new,
+ul.keys li.new {
+	opacity: .4;
 }
 
 /* l/r help columns */
diff --git a/readline.inc.pl b/readline.inc.pl
index 9253532..f617218 100644
--- a/readline.inc.pl
+++ b/readline.inc.pl
@@ -20,6 +20,13 @@ use utf8;
 	'+~' => '+&', # emacs
 	'^_' => ["undo", 'co'],
 
+	'+~' => ["user$sign{_}name exp$sign{_}and", 'mi ext'], # common emacs => '+&'
+	'+!' => ["cmd expand", 'mi ext'],
+	'+@' => ["host$sign{_}name exp$sign{_}and", 'mi ext'],
+	'+$' => ["variable expand", 'mi ext'],
+	'+^' => ["history expand", 'co ext'],
+	'+/' => ["filename expand", 'ci ext'],
+
 	'^a' => ["begin of line", 'pm'],
 	'^b' => ["char back$sign{_}w$sign{_}ard$sign{_}s", 'pm'],
 	'+b' => ["word back$sign{_}w$sign{_}ard$sign{_}s", 'pm'],
@@ -32,7 +39,7 @@ use utf8;
 	'+f' => ["word forward", 'pm'],
 	'^g' => ["abort cmd, bell", 'mv'],
 	'^h' => ["back$sign{_}space", 'mo'],
-	'^i' => ["complete", 'mi', '(tab)'],
+	'^i' => ["auto$sign{_}complet$sign{_}e", 'mi', '(tab)'],
 	'^j' => '^m',
 	'^+j'=> ["vim mode", 'me'],
 	'^k' => ["delete till eol", 'mo ring'],
@@ -41,6 +48,7 @@ use utf8;
 	'^m' => ["enter line", 'co', '(enter)'],
 	'^n' => ["history next", 'co'],
 	'+n' => ["match history", 'co'],
+	'^o' => ["enter and next", 'co ext'],
 	'^p' => ["history back", 'co'],
 	'+p' => ["rev match history", 'co'],
 	'^q' => '^v', # Quote
diff --git a/readline.plp b/readline.plp
index a49c6d3..0e6a3da 100644
--- a/readline.plp
+++ b/readline.plp
@@ -82,6 +82,8 @@ $keys->print_rows($get{static} || '543');
 		<dl class="legend legend-options">
 		<dt>key<:= $sign{arg} :>
 			<dd>Commands with a dot need a char argument afterwards.
+		<dt class="ext">bash
+			<dd>Default assignment in Bash shells, but not common readline
 		</dl>
 
 		<ul class="legend legend-set">
diff --git a/vim.inc.pl b/vim.inc.pl
index b73b254..e46ec3f 100644
--- a/vim.inc.pl
+++ b/vim.inc.pl
@@ -6,12 +6,12 @@ use utf8;
 	'~' => ["case toggle", "co undo"],
 	'!' => ["filt$sign{_}er lines", "co argm undo modec"],
 	'@' => ["play macro", "co arg undo"],
-	'#' => ["rev. find word", "pm vim"],
+	'#' => ["rev. find word", "pm ext vim6"],
 	'$' => ["eol", "pm"],
 	'%' => ["goto match", "pm"],
 	'^' => ['"soft" bol', "pm"],
 	'&' => [":s rep$sign{_}eat", "co undo"],
-	'*' => ["find word", "pm vim"],
+	'*' => ["find word", "pm ext vim6"],
 	'(' => ["begin senten$sign{_}ce", 'pm'],
 	')' => ["end senten$sign{_}ce", 'pm'],
 	'_' => ['"soft" bol down', "pm"],
@@ -66,7 +66,7 @@ use utf8;
 	'^h'=> "h",
 	'i' => ["insert mode", "mi undo modei"],
 	'I' => ["insert at bol", "mi undo modei"],
-	'^i'=> ["jump to newer", "pm vim", 'Increase position'],
+	'^i'=> ["jump to newer", "pm ext vim6", 'Increase position'],
 	'j' => [$sign{down}, "pm"],
 	'J' => ["join lines", "co undo"],
 	'^j'=> "j",
@@ -83,7 +83,7 @@ use utf8;
 	'^n'=> "j",
 	'o' => ["line below", "mi undo modei", 'Open'],
 	'O' => ["line above", "mi undo modei"],
-	'^o'=> ["jump to older", "pm vim"],
+	'^o'=> ["jump to older", "pm ext vim6"],
 	'p' => ["paste after", "co undo"],
 	'P' => ["paste before", "co undo"],
 	'^p'=> "k",
@@ -92,7 +92,7 @@ use utf8;
 	'^q'=> ["(xon)", "ci", 'Qome back'], # or ^v
 	'r' => ["repl$sign{_}ace char", "co arg undo"],
 	'R' => ["repl$sign{_}ace mode", "mi undo modei"],
-	'^r'=> ["redo", "co undo vim"],
+	'^r'=> ["redo", "co undo ext vim6"],
 	's' => ["subst char", "mi undo modei"],
 	'S' => ["subst line", "mi undo modei"],
 	'^s'=> ["(xoff)", "ci", 'Stop'],
@@ -104,7 +104,7 @@ use utf8;
 	'^u'=> ["scroll up", "po"],
 	'v' => ["visual mode", "mv modev"],
 	'V' => ["visual lines", "mv modev"],
-	'^v'=> ["visual block", "mv modev vim"],
+	'^v'=> ["visual block", "mv modev ext vim6"],
 	'w' => ["next word", "pm"],
 	'W' => ['next <span style="font-variant:small-caps">word</span>', "pm"],
 	'^w'=> ["win$sign{_}dow cmds", "me arg mode^w"],
@@ -123,63 +123,63 @@ g => {
 	desc => "extended commands (g)",
 	lead => "g",
 
-	'~' => ["case toggl$sign{_}e", "co argm vim"],
-	'@' => ["oper$sign{_}at$sign{_}or$sign{_}func", "co vim7"],
-	'#' => ["rev. find string", "pm vim"],
+	'~' => ["case toggl$sign{_}e", "co argm ext vim6"],
+	'@' => ["oper$sign{_}at$sign{_}or$sign{_}func", "co ext vim7 new"],
+	'#' => ["rev. find string", "pm ext vim6"],
 	'$' => ["virt$sign{_}ual eol", "pm"],
-	'^' => [qq'"soft" bol v$sign{_}irt$sign{_}ual', "pm vim"],
+	'^' => [qq'"soft" bol v$sign{_}irt$sign{_}ual', "pm ext vim6"],
 	'&' => [":s rep$sign{_}eat glob$sign{_}al$sign{_}ly", "co", "Global substitute"],
-	'*' => ["find string", "pm vim"],
-	'_' => [qq'"soft" eol', "pm vim"],
-	'+' => ["later undo", "co vim7"],
-	'`' => ["to mark keepj$sign{_}umps", "pm vim arg"],
+	'*' => ["find string", "pm ext vim6"],
+	'_' => [qq'"soft" eol', "pm ext vim6"],
+	'+' => ["later undo", "co ext vim7 new"],
+	'`' => ["to mark keepj$sign{_}umps", "pm ext vim6 arg"],
 	'8' => ["char hex val$sign{_}ue$sign{_}s", "ci"],
-	'0' => ["virtual bol", "pm vim"],
-	'-' => ["earlier undo", "co vim7"],
+	'0' => ["virtual bol", "pm ext vim6"],
+	'-' => ["earlier undo", "co ext vim7 new"],
 	'^['=> ["esc", "mo mode"],
 	']' => ["go to tselect", "po"],
 	'^]'=> ["go to tjump", "po"],
 	';' => ["to prev change pos", "pm"],
-	"'" => ["to mark keepj$sign{_}umps", "pm vim arg"],
-	'<' => ["see prev cmd output", "co vim7"],
-	'?' => ["rot13 encode", "co argm vim"],
+	"'" => ["to mark keepj$sign{_}umps", "pm ext vim6 arg"],
+	'<' => ["see prev cmd output", "co ext vim7 new"],
+	'?' => ["rot13 encode", "co argm ext vim6"],
 	',' => ["to next change pos", "pm"],
 
 	'a' => ["char value", "ci", "Get Ascii value"],
 	'^a'=> ["mem usage stats", "ci"],
-	'd' => ["local declar$sign{_}ation", "pm vim"],
-	'D' => ["global declar$sign{_}ation", "pm vim"],
+	'd' => ["local declar$sign{_}ation", "pm ext vim6"],
+	'D' => ["global declar$sign{_}ation", "pm ext vim6"],
 	'e' => ["back to word end", "pm"],
 	'E' => [qq'back to <span style="font-variant:small-caps">word</span> end', "pm"],
-	'f' => ["edit file at cur$sign{_}sor", "co vim", "Goto File"],
-	'F' => ["edit file + jump", "co vim7"],
+	'f' => ["edit file at cur$sign{_}sor", "co ext vim6", "Goto File"],
+	'F' => ["edit file + jump", "co ext vim7 new"],
 	'g' => ["first line", "pm"],
 	'^g'=> ["cur$sign{_}sor pos info", "ci"],
 	'h' => ["select mode", "mv modev", "Get Highlighted"],
 	'H' => ["select lines", "mv modev", "Get Highlighted"],
-	'^h'=> ["select block", "mv modev vim", "Get Highlighted"],
+	'^h'=> ["select block", "mv modev ext vim6", "Get Highlighted"],
 	'i' => ["insert at last pos", "mi undo modei"],
 	'I' => ["insert at soft bol", "mi undo modei"],
-	'j' => ["$sign{down} screen", "pm vim"],
+	'j' => ["$sign{down} screen", "pm ext vim6"],
 	'J' => ["join leave spac$sign{_}ing", "co"],
-	'k' => ["$sign{up} screen", "pm vim"],
-	'm' => ["cen$sign{_}ter screen", "pm vim"],
+	'k' => ["$sign{up} screen", "pm ext vim6"],
+	'm' => ["cen$sign{_}ter screen", "pm ext vim6"],
 	'o' => [":goto (byte)", "pm"],
 	'p' => ["paste still", "co undo"],
 	'P' => ["paste before still", "co"],
 	'q' => ["for$sign{_}mat", "co argm"],
-	'Q' => ["ex mode manual :", "mo vim"],
+	'Q' => ["ex mode manual :", "mo ext vim6"],
 	'r' => ["virt. repl$sign{_}ace char", "co arg"],
 	'R' => ["virt. repl$sign{_}ace mode", "mi undo modei"],
-	's' => ["sleep", "ci vim", "Go to Sleep"],
-	't' => ["next tab", "po vim7", "Goto Tab"],
-	'T' => ["tab back", "po vim7"],
-	'u' => ["lower$sign{_}case", "co argm vim"], # XXX undo?
-	'U' => ["up$sign{_}per$sign{_}case", "co undo argm vim"],
+	's' => ["sleep", "ci ext vim6", "Go to Sleep"],
+	't' => ["next tab", "po ext vim7 new", "Goto Tab"],
+	'T' => ["tab back", "po ext vim7 new"],
+	'u' => ["lower$sign{_}case", "co argm ext vim6"], # XXX undo?
+	'U' => ["up$sign{_}per$sign{_}case", "co undo argm ext vim6"],
 	'v' => ["prev$sign{_}ious highl$sign{_}ight", 'mv modev', 'precedinG Visual'],
 	'V' => ["avoid resel$sign{_}ect$sign{_}ion", "co"],
-	'w' => ["for$sign{_}mat still", "co argm vim7"],
-	'x' => ["Netrw$sign{_}BrowseX", "co vim7"],
+	'w' => ["for$sign{_}mat still", "co argm ext vim7 new"],
+	'x' => ["Netrw$sign{_}BrowseX", "co ext vim7 new"],
 }, # mode g
 
 Z => {
@@ -188,7 +188,7 @@ Z => {
 
 	'^['=> ["esc", "mo mode"],
 
-	'Q' => [" :q! (force)", "co vim"],
+	'Q' => [" :q! (force)", "co ext vim6"],
 	'Z' => [" :wq (write)", "co"],
 }, # mode Z
 
@@ -199,47 +199,47 @@ z => {
 	'^' => ["page above", "po"],
 	'+' => ["page below", "po"],
 	'-' => ["line at bottom bol", "po", "don't (-) see any further"],
-	'=' => ["sug$sign{_}gest spell$sign{_}ing", "co vim7"],
+	'=' => ["sug$sign{_}gest spell$sign{_}ing", "co ext vim7 new"],
 	'.' => ["line at center bol", "po"],
 	'^['=> ["esc", "mo mode"],
 
-	'a' => ["toggle fold", "co vim folding"],
-	'A' => ["toggle fold rec$sign{_}urs$sign{_}ive$sign{_}ly", "co vim folding"],
+	'a' => ["toggle fold", "co ext vim6 folding"],
+	'A' => ["toggle fold rec$sign{_}urs$sign{_}ive$sign{_}ly", "co ext vim6 folding"],
 	'b' => ["line at bot. bol", "po"],
-	'c' => ["close fold", "co vim folding"],
-	'C' => ["close folds rec$sign{_}curs$sign{_}ive$sign{_}ly", "co vim folding"],
-	'd' => ["delete fold", "co vim folding"],
-	'D' => ["delete folds rec$sign{_}urs$sign{_}ive", "co vim folding"],
+	'c' => ["close fold", "co ext vim6 folding"],
+	'C' => ["close folds rec$sign{_}curs$sign{_}ive$sign{_}ly", "co ext vim6 folding"],
+	'd' => ["delete fold", "co ext vim6 folding"],
+	'D' => ["delete folds rec$sign{_}urs$sign{_}ive", "co ext vim6 folding"],
 	'e' => ["cursor at right side", "po"],
-	'E' => ["elimi$sign{_}nate f$sign{_}olds", "co vim folding"],
-	'f' => ["create fold", "co argm vim folding"],
-	'F' => ["fold lines", "co vim folding"],
-	'g' => ["add spell$sign{_}ing", "co vim7", 'Good word'],
-	'G' => ["temp spell$sign{_}ing", "co vim7"],
+	'E' => ["elimi$sign{_}nate f$sign{_}olds", "co ext vim6 folding"],
+	'f' => ["create fold", "co argm ext vim6 folding"],
+	'F' => ["fold lines", "co ext vim6 folding"],
+	'g' => ["add spell$sign{_}ing", "co ext vim7 new", 'Good word'],
+	'G' => ["temp spell$sign{_}ing", "co ext vim7 new"],
 	'h' => ["scroll $sign{right}", "po"],
 	'H' => ["scroll $sign{right} half scr$sign{_}een", "po"],
-	'i' => ["toggle all folds", "co vim folding"],
-	'j' => ["next fold start", "pm vim folding"],
-	'k' => ["prev fold end", "pm vim folding"],
+	'i' => ["toggle all folds", "co ext vim6 folding"],
+	'j' => ["next fold start", "pm ext vim6 folding"],
+	'k' => ["prev fold end", "pm ext vim6 folding"],
 	'l' => ["scroll $sign{left}", "po"],
 	'L' => ["scroll $sign{left} half scr$sign{_}een", "po"],
 	'^m'=> ["line at top bol", "po"],
-	'm' => ["fold more", "co vim folding"],
-	'M' => ["close all folds", "co vim folding"],
-	'n' => ["fold none", "co vim folding"],
-	'N' => ["fold norm$sign{_}al", "co vim folding"],
-	'o' => ["open fold", "co vim folding"],
-	'O' => ["open folds rec$sign{_}urs$sign{_}ive$sign{_}ly", "co vim folding"],
-	'r' => ["reduce folding", "co vim folding"],
-	'R' => ["open all folds", "co vim folding"],
+	'm' => ["fold more", "co ext vim6 folding"],
+	'M' => ["close all folds", "co ext vim6 folding"],
+	'n' => ["fold none", "co ext vim6 folding"],
+	'N' => ["fold norm$sign{_}al", "co ext vim6 folding"],
+	'o' => ["open fold", "co ext vim6 folding"],
+	'O' => ["open folds rec$sign{_}urs$sign{_}ive$sign{_}ly", "co ext vim6 folding"],
+	'r' => ["reduce folding", "co ext vim6 folding"],
+	'R' => ["open all folds", "co ext vim6 folding"],
 	's' => ["cursor at left side", "po"],
 	't' => ["line at top", "po"],
-	'u' => ["undo spell$sign{_}ing", "co arg vim7"],
-	'v' => ["unfold cursor line", "co vim folding"],
-	'w' => ["add missp$sign{_}ell$sign{_}ing", "co vim7", "Wrong word"],
-	'W' => ["temp missp$sign{_}ell$sign{_}ing", "co vim7"],
-	'x' => ["update folds", "co vim folding"],
-	'X' => ["re$sign{_}apply f$sign{_}olds", "co vim folding"],
+	'u' => ["undo spell$sign{_}ing", "co arg ext vim7 new"],
+	'v' => ["unfold cursor line", "co ext vim6 folding"],
+	'w' => ["add missp$sign{_}ell$sign{_}ing", "co ext vim7 new", "Wrong word"],
+	'W' => ["temp missp$sign{_}ell$sign{_}ing", "co ext vim7 new"],
+	'x' => ["update folds", "co ext vim6 folding"],
+	'X' => ["re$sign{_}apply f$sign{_}olds", "co ext vim6 folding"],
 	'z' => ["line at center", "po", "Zee Zenter (with a funny accent)"],
 }, # mode z
 
@@ -247,12 +247,12 @@ z => {
 	desc => "backward search commands ([)",
 	lead => "[",
 
-	"`" => ["previous lc mark", "pm vim"],
+	"`" => ["previous lc mark", "pm ext vim6"],
 	'#' => ["previous open #if$sign{_}/#else", "pm"],
 	'(' => ["previous open (", "pm"],
 	'*' => "[/",
 	'/' => ["start of C com$sign{_}m$sign{_}ent", "pm"],
-	"'" => "[` ^", # vim
+	"'" => "[` ^", # ext vim6
 	'{' => ["previous open {", "pm"],
 	'[' => ["section back$sign{_}ward$sign{_}s", "pm"],
 	'^['=> ["esc", "mo mode"],
@@ -269,20 +269,20 @@ z => {
 	'm' => ["start of funct$sign{_}ion", "pm"],
 	'p' => ["P reind$sign{_}ent$sign{_}ed", "co"],
 	'P' => ["[p", "co"],
-	's' => ["last missp$sign{_}ell$sign{_}ing", "po vim7"],
-	'S' => ["last bad word", "po vim7"],
-	'z' => ["start of open fold", "pm vim folding"],
+	's' => ["last missp$sign{_}ell$sign{_}ing", "po ext vim7 new"],
+	'S' => ["last bad word", "po ext vim7 new"],
+	'z' => ["start of open fold", "pm ext vim6 folding"],
 }, # mode [
 
 ']' => {
 	desc => "forward search commands (])",
 	lead => "]",
 
-	"`" => ["next lc mark", "pm vim"],
+	"`" => ["next lc mark", "pm ext vim6"],
 	'#' => ["next open #endif$sign{_}/#else", "pm"],
 	')' => ["next open )", "pm"],
 	'*' => "]/",
-	"'" => "]` ^", # vim
+	"'" => "]` ^", # ext vim6
 	'/' => ["end of C com$sign{_}m$sign{_}ent", "pm"],
 	'[' => [qq'<span style="font-variant:small-caps">section</span> forw$sign{_}ard', "pm"],
 	'^['=> ["esc", "mo mode"],
@@ -300,9 +300,9 @@ z => {
 	'm' => ["end of funct$sign{_}ion", "pm"],
 	'p' => ["p reind$sign{_}ent$sign{_}ed", "co"],
 	'P' => "[p",
-	's' => ["next missp$sign{_}ell$sign{_}ing", "po vim7"],
-	'S' => ["next bad word", "po vim7"],
-	'z' => ["end of open fold", "pm vim folding"],
+	's' => ["next missp$sign{_}ell$sign{_}ing", "po ext vim7 new"],
+	'S' => ["next bad word", "po ext vim7 new"],
+	'z' => ["end of open fold", "pm ext vim6 folding"],
 }, # mode ]
 
 '^w' => {
@@ -326,7 +326,7 @@ z => {
 	'^c'=> ["abort", "mo mode"],
 	'd' => ["split, to def$sign{_}inition", "po"],
 	'f' => ["split, file edit", "co"],
-	'F' => ["^wf, jump to line", "co vim7"],
+	'F' => ["^wf, jump to line", "co ext vim7 new"],
 	'g' => ["extra cmds", "me arg mode^wg"],
 	'h' => ["go left", "po"],
 	'H' => ["move far left", "po"],
@@ -362,8 +362,8 @@ z => {
 	']' => ["split, :ts$sign{_}elect", "po"],
 	'}' => [":ptj$sign{_}ump to tag", "po"],
 	'^]'=> ["split, :tj$sign{_}ump", "po"],
-	'f' => ["file in tab", "co vim7"],
-	'F' => ["^wgf, to line$sign{_}nr", "co vim7"],
+	'f' => ["file in tab", "co ext vim7 new"],
+	'F' => ["^wgf, to line$sign{_}nr", "co ext vim7 new"],
 }, # mode ^w g
 
 v => {
@@ -374,23 +374,23 @@ v => {
 	'<' => ["un$sign{_}indent", "co"],
 	'=' => ["re$sign{_}ind$sign{_}ent", 'co undo'],
 	'>' => ["ind$sign{_}ent", 'co'],
-	'~' => ["toggle case", "co vim"],
+	'~' => ["toggle case", "co ext vim6"],
 	'^['=> ["esc", "mo mode"],
 	'^]'=> ["jump to tag", "po"],
 	'^\\'=>'^\\',
 
-	'a' => ["ex$sign{_}tend area", 'me modeva arg vim'],
-	'A' => ["ap$sign{_}pend to block", 'mi modei vim'], # block
-	'c' => ["repl$sign{_}ace area", 'mi modei vim'],
-	'C' => ["repl$sign{_}ace full lines", 'mi modei vim'], # like vS, but blocks are extended until eol
+	'a' => ["ex$sign{_}tend area", 'me modeva arg ext vim6'],
+	'A' => ["ap$sign{_}pend to block", 'mi modei ext vim6'], # block
+	'c' => ["repl$sign{_}ace area", 'mi modei ext vim6'],
+	'C' => ["repl$sign{_}ace full lines", 'mi modei ext vim6'], # like vS, but blocks are extended until eol
 	'^c'=> ["abort", "mo mode"],
-	'd' => ["delete area", "co vim"],
-	'D' => ["delete lines", "co vim"],
+	'd' => ["delete area", "co ext vim6"],
+	'D' => ["delete lines", "co ext vim6"],
 	'g' => ["extra cmds", "me arg modevg"],
 	'^g'=> ["select mode", "mv"],
 	'^h'=> ["back$sign{_}space", 'co'], # delete in select mode, left otherwise
-	'i' => ["extend inner a$sign{_}r$sign{_}ea", "me modeva arg vim"],
-	'I' => ["insert to block", "mi modei vim"], # block
+	'i' => ["extend inner a$sign{_}r$sign{_}ea", "me modeva arg ext vim6"],
+	'I' => ["insert to block", "mi modei ext vim6"], # block
 	'J' => ["join lines", "co"],
 	'K' => ["help sel$sign{_}ect$sign{_}ion", 'co'],
 	'o' => ["to other corner", "pm"],
@@ -403,12 +403,12 @@ v => {
 	'R' => "vS",  # "might change in future"
 	'^s'=> "^s",
 	's' => "vc",
-	'S' => ["repl$sign{_}ace lines", 'mi modei vim'],
-	'u' => ["lower$sign{_}case", "co vim"],
-	'U' => ["upper$sign{_}case", "co vim"],
+	'S' => ["repl$sign{_}ace lines", 'mi modei ext vim6'],
+	'u' => ["lower$sign{_}case", "co ext vim6"],
+	'U' => ["upper$sign{_}case", "co ext vim6"],
 	'v' => ["char$sign{_}wise", "mv"],
 	'V' => ["line$sign{_}wise", "mv"],
-	'^v'=> ["block$sign{_}wise", "mv vim"],
+	'^v'=> ["block$sign{_}wise", "mv ext vim6"],
 	'x' => "vd",
 	'X' => "vD",
 	'y' => ["yank area", "co"],
@@ -426,11 +426,11 @@ vg => {
 	lead => "g",
 
 	'^['=> ["esc", "mv modev"],
-	'?' => ["rot13 encode", "co vim"],
-	'J' => ["join literal$sign{_}ly", 'co vim'],
-	'q' => ["for$sign{_}mat", "co vim"],
+	'?' => ["rot13 encode", "co ext vim6"],
+	'J' => ["join literal$sign{_}ly", 'co ext vim6'],
+	'q' => ["for$sign{_}mat", "co ext vim6"],
 	'v' => 'gv',
-	'w' => ["for$sign{_}mat still", 'co vim7'],
+	'w' => ["for$sign{_}mat still", 'co ext vim7 new'],
 }, # mode v g
 
 va => {
@@ -439,23 +439,23 @@ va => {
 	'(' => 'vab',
 	')' => 'vab',
 	'`' => "va'",
-	"'" => ["quoted string", 'pm vim7'],
+	"'" => ["quoted string", 'pm ext vim7 new'],
 	'"' => "va'",
-	'<' => ["<> block", 'pm vim'],
+	'<' => ["<> block", 'pm ext vim6'],
 	'>' => 'va<',
-	'[' => ["[] block", 'pm vim'],
+	'[' => ["[] block", 'pm ext vim6'],
 	'{' => 'vaB',
 	'^['=> ["esc", 'mv modev'],
 	']' => 'va[',
 	'}' => 'vaB',
 
-	'b' => ["() block", 'pm vim'],
-	'B' => ["{} Block", 'pm vim'],
-	'p' => ["para$sign{_}graph", 'pm vim'],
-	's' => ["senten$sign{_}ce", 'pm vim'],
-	't' => ["xml tag block", 'pm vim7'],
-	'w' => ["word", 'pm vim'],
-	'W' => ['<span style="font-variant:small-caps">word</span>', 'pm vim'],
+	'b' => ["() block", 'pm ext vim6'],
+	'B' => ["{} Block", 'pm ext vim6'],
+	'p' => ["para$sign{_}graph", 'pm ext vim6'],
+	's' => ["senten$sign{_}ce", 'pm ext vim6'],
+	't' => ["xml tag block", 'pm ext vim7 new'],
+	'w' => ["word", 'pm ext vim6'],
+	'W' => ['<span style="font-variant:small-caps">word</span>', 'pm ext vim6'],
 }, # mode v a
 
 #c => {
@@ -476,7 +476,7 @@ va => {
 #	'^n' => ["complete", ""], #todo
 #	'^p' => ["complete", ""], #todo
 #	'^r' => 'i^r', # and then some...
-#	     ## ["insert register", "co arg vim"],
+#	     ## ["insert register", "co arg ext vim6"],
 #	'^q' => '^q',
 #	'^u' => 'i^u',
 #	'^v' => 'i^v',
@@ -488,38 +488,38 @@ i => {
 	desc => "insert mode",
 
 	'^@' => ["last insert", "co"],
-	'^^' => ["toggle :lmap usag$sign{_}e", "co vim"],
+	'^^' => ["toggle :lmap usag$sign{_}e", "co ext vim6"],
 	'^[' => ["esc", "mo mode"],
-	'^]' => ["abbrev$sign{_}iate", "co vim"],
-	'^_' => ["toggle lang$sign{_}uage", "co vim"],
+	'^]' => ["abbrev$sign{_}iate", "co ext vim6"],
+	'^_' => ["toggle lang$sign{_}uage", "co ext vim6"],
 	'^\\'=>'^\\',
 
-	'^a' => ["insert prev$sign{_}ious", "co vim"],
-	'^b' => ["former i^_", "no vim"],
+	'^a' => ["insert prev$sign{_}ious", "co ext vim6"],
+	'^b' => ["former i^_", "no ext vim6"],
 	'^c' => ["abort, no abbr", "mo mode"],
 	'^d' => ["un$sign{_}ind$sign{_}ent", 'co'],
-	'^e' => ["ins char below", "co vim"],
+	'^e' => ["ins char below", "co ext vim6"],
 	'^f' => ["set indent$sign{_}ation", 'co'],
 	'^g' => ["extra cmds", "me modei^g arg"],
 	'^h' => ["back$sign{_}space", "co"],
 	'^i' => ["tab", "co"],
 	'^j' => ["enter", "co"],
-	'^k' => ["di$sign{_}graph", 'co arg arg vim linkdigraphs', "Key code"],
-	'^l' => ["<em>im</em> leave ins mode", "mo mode vim"],  # insertmode only
+	'^k' => ["di$sign{_}graph", 'co arg arg ext vim6 linkdigraphs', "Key code"],
+	'^l' => ["<em>im</em> leave ins mode", "mo mode ext vim6"],  # insertmode only
 	'^m' => ["enter", "co"],
-	'^n' => ["find next keyword", "pm vim"],
+	'^n' => ["find next keyword", "pm ext vim6"],
 	'^o' => ["exec$sign{_}ute cmd", 'co'],
-	'^p' => ["find prev keyword", "pm vim"],
+	'^p' => ["find prev keyword", "pm ext vim6"],
 	'^q' => "^q",  # or i^v
-	'^r' => ["insert reg$sign{_}ister", 'co arg vim'],
+	'^r' => ["insert reg$sign{_}ister", 'co arg ext vim6'],
 	'^s' => "^s",
 	'^t' => ["indent", "co"],
 	'^u' => ["delete line", "co"],
 	'^v' => ["literal or ch$sign{_}ar$sign{_}cod$sign{_}e", 'co linkcharset', "Verbatim or by Value"],
 	'^w' => ["delete word back", "co"],
-	'^x' => ["ex$sign{_}pand mode", 'me arg modei^x vim'],
-	'^y' => ["ins char above", "co vim"],
-	'^z' => [":sus$sign{_}pend in <em>im</em>", "ci vim"],  # insertmode only
+	'^x' => ["ex$sign{_}pand mode", 'me arg modei^x ext vim6'],
+	'^y' => ["ins char above", "co ext vim6"],
+	'^z' => [":sus$sign{_}pend in <em>im</em>", "ci ext vim6"],  # insertmode only
 }, # modei
 
 'i^g' => {
@@ -545,12 +545,12 @@ i => {
 	'^k' => ["dict comp$sign{_}l$sign{_}et$sign{_}e", 'co'],
 	'^l' => ["line comp$sign{_}l$sign{_}et$sign{_}e", 'co'],
 	'^n' => ["next comp$sign{_}l$sign{_}et$sign{_}e", 'co'],
-	'^o' => ["omni comp$sign{_}l$sign{_}et$sign{_}e", 'co vim7'],
+	'^o' => ["omni comp$sign{_}l$sign{_}et$sign{_}e", 'co ext vim7 new'],
 	'^p' => ["prev comp$sign{_}l$sign{_}ete", 'co'],
 	'^s' => ["spell sugg$sign{_}est", 'co'],
 	 's' => 'i^x^s',
 	'^t' => ["thes$sign{_}aur$sign{_}us compl$sign{_}et$sign{_}e", 'co'],
-	'^u' => ["cus$sign{_}tom comp$sign{_}l$sign{_}et$sign{_}e", 'co vim7'],
+	'^u' => ["cus$sign{_}tom comp$sign{_}l$sign{_}et$sign{_}e", 'co ext vim7 new'],
 	'^v' => ["ex cmd compl$sign{_}et$sign{_}e", 'co'],
 	'^y' => ["window down", "po"],
 }, # mode i ^x
diff --git a/vim.plp b/vim.plp
index 1e1d762..92a1f5f 100644
--- a/vim.plp
+++ b/vim.plp
@@ -87,9 +87,9 @@ $keys->print_rows($get{static});
 			<dd>Commands with a dot need a char argument afterwards.
 		<dt>key<:= $sign{motion} :>
 			<dd>Requires a motion afterwards, operates between cursor and destination.
-		<dt class="vim">vim
+		<dt class="ext vim6">vim
 			<dd>Not in original Vi (assessment incomplete).
-		<dt class="vim7">vim7
+		<dt class="ext new vim7">vim7
 			<dd>New in vim version 7.x.
 		</dl>
 
-- 
2.30.0