From 3a7cbea8cf400e3dc953eab02a09f67df2761209 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Fri, 18 May 2018 23:36:55 +0200 Subject: [PATCH] vi: do not distinguish newer vim versions Assume vim7 distinction is no longer significant; it was released in 2006 and commonly installed by now. One is more likely to encounter vim-tiny or some clone, in which case only vi features are safe. Also ignore vim8 as it only assigns about 4 keys, all outside of normal mode. Rather reclassify all vim extensions as "new" instead of "ext", freeing the latter for optional features more in line with other pages. --- vi.eng.inc.pl | 257 +++++++++++++++++++++++++------------------------- 1 file changed, 128 insertions(+), 129 deletions(-) diff --git a/vi.eng.inc.pl b/vi.eng.inc.pl index 48a3832..5d75a58 100644 --- a/vi.eng.inc.pl +++ b/vi.eng.inc.pl @@ -480,8 +480,7 @@ flag => { arg => ["key", "Commands with a dot need a char argument afterwards."], motion => ["key", "Requires a motion afterwards, operates between cursor and destination."], - 'vim6 ext' => ["vim", "Not in original Vi (assessment incomplete)."], - 'vim7 ext new' => ["vim7", "New in vim version 7.x."], + 'vim6 new' => ["vim", "Not in original Vi (assessment incomplete)."], }, def => { @@ -489,12 +488,12 @@ def => { '~' => "g4 undo", '!' => "g4 argm undo modec", '@' => "g4 arg undo", - '#' => "g2 ext vim6", + '#' => "g2 vim6 new", '$' => "g2", '%' => "g2", '^' => "g2", '&' => "g4 undo", - '*' => "g2 ext vim6", + '*' => "g2 vim6 new", '(' => 'g2', ')' => 'g2', '_' => "g2", @@ -549,7 +548,7 @@ def => { '^h'=> "=h", 'i' => "g6 undo modei", 'I' => "g6 undo modei", - '^i'=> "g2 ext vim6", + '^i'=> "g2 vim6 new", 'j' => "g2", 'J' => "g4 undo", '^j'=> "=j", @@ -566,7 +565,7 @@ def => { '^n'=> "=j", 'o' => "g6 undo modei", 'O' => "g6 undo modei", - '^o'=> "g2 ext vim6", + '^o'=> "g2 vim6 new", 'p' => "g4 undo", 'P' => "g4 undo", '^p'=> "=k", @@ -575,7 +574,7 @@ def => { '^q'=> "g1", # or ^v 'r' => "g4 arg undo", 'R' => "g6 undo modei", - '^r'=> "g4 undo ext vim6", + '^r'=> "g4 undo vim6 new", 's' => "g6 undo modei", 'S' => "g6 undo modei", '^s'=> "g1", @@ -587,7 +586,7 @@ def => { '^u'=> "g3", 'v' => "g8 modev", 'V' => "g8 modev", - '^v'=> "g8 modev ext vim6", + '^v'=> "g8 modev vim6 new", 'w' => "g2", 'W' => "g2", '^w'=> "g9 arg mode^w", @@ -607,65 +606,65 @@ def => { "\e"=> "g7 mode", - '~' => "g4 argm ext vim6", - '@' => "g4 ext vim7 new", - '#' => "g2 ext vim6", + '~' => "g4 argm vim6 new", + '@' => "g4 vim7 new", + '#' => "g2 vim6 new", '$' => "g2", - '^' => "g2 ext vim6", + '^' => "g2 vim6 new", '&' => "g4", - '*' => "g2 ext vim6", - '_' => "g2 ext vim6", - '+' => "g4 ext vim7 new", - '`' => "g2 ext vim6 arg", + '*' => "g2 vim6 new", + '_' => "g2 vim6 new", + '+' => "g4 vim7 new", + '`' => "g2 vim6 new arg", '8' => "g1", - '0' => "g2 ext vim6", - '-' => "g4 ext vim7 new", + '0' => "g2 vim6 new", + '-' => "g4 vim7 new", '^['=> "g7 mode", ']' => "g3", '^]'=> "g3", ';' => "g2", - "'" => "g2 ext vim6 arg", - '<' => "g4 ext vim7 new", - '?' => "g4 argm ext vim6", + "'" => "g2 vim6 new arg", + '<' => "g4 vim7 new", + '?' => "g4 argm vim6 new", ',' => "g2", 'a' => "g1", '^a'=> "g1", - 'd' => "g2 ext vim6", - 'D' => "g2 ext vim6", + 'd' => "g2 vim6 new", + 'D' => "g2 vim6 new", 'e' => "g2", 'E' => "g2", - 'f' => "g4 ext vim6", - 'F' => "g4 ext vim7 new", + 'f' => "g4 vim6 new", + 'F' => "g4 vim7 new", 'g' => "g2", '^g'=> "g1 vim6", 'h' => "g8 modev", 'H' => "g8 modev", - '^h'=> "g8 modev ext vim6", + '^h'=> "g8 modev vim6 new", 'i' => "g6 undo modei", 'I' => "g6 undo modei", - 'j' => "g2 ext vim6", + 'j' => "g2 vim6 new", 'J' => "g4", - 'k' => "g2 ext vim6", - 'm' => "g2 ext vim6", + 'k' => "g2 vim6 new", + 'm' => "g2 vim6 new", 'n' => "g8 vim7 new modev", 'N' => "g8 vim7 new modev", 'o' => "g2", 'p' => "g4 undo", 'P' => "g4", 'q' => "g4 argm", - 'Q' => "g7 ext vim6", + 'Q' => "g7 vim6 new", 'r' => "g4 arg", 'R' => "g6 undo modei", - 's' => "g1 ext vim6", - 't' => "g3 ext vim7 new", - 'T' => "g3 ext vim7 new", - 'u' => "g4 argm ext vim6", # XXX undo? - 'U' => "g4 undo argm ext vim6", + 's' => "g1 vim6 new", + 't' => "g3 vim7 new", + 'T' => "g3 vim7 new", + 'u' => "g4 argm vim6 new", # XXX undo? + 'U' => "g4 undo argm vim6 new", 'v' => 'g8 modev', 'V' => "g4", - 'w' => "g4 argm ext vim7 new", - 'x' => "g4 ext vim7 new", + 'w' => "g4 argm vim7 new", + 'x' => "g4 vim7 new", }, # mode g Z => { @@ -674,7 +673,7 @@ def => { "\e"=> "g7 mode", '^['=> "=\e", - 'Q' => "g4 ext vim6", + 'Q' => "g4 vim6 new", 'Z' => "g4", }, # mode Z @@ -686,47 +685,47 @@ def => { '^' => "g3", '+' => "g3", '-' => "g3", - '=' => "g4 ext vim7 new", + '=' => "g4 vim7 new", '.' => "g3", '^['=> "=\e", - 'a' => "g4 ext vim6 folding", - 'A' => "g4 ext vim6 folding", + 'a' => "g4 vim6 new folding", + 'A' => "g4 vim6 new folding", 'b' => "g3", - 'c' => "g4 ext vim6 folding", - 'C' => "g4 ext vim6 folding", - 'd' => "g4 ext vim6 folding", - 'D' => "g4 ext vim6 folding", + 'c' => "g4 vim6 new folding", + 'C' => "g4 vim6 new folding", + 'd' => "g4 vim6 new folding", + 'D' => "g4 vim6 new folding", 'e' => "g3", - 'E' => "g4 ext vim6 folding", - 'f' => "g4 argm ext vim6 folding", - 'F' => "g4 ext vim6 folding", - 'g' => "g4 ext vim7 new", - 'G' => "g4 ext vim7 new", + 'E' => "g4 vim6 new folding", + 'f' => "g4 argm vim6 new folding", + 'F' => "g4 vim6 new folding", + 'g' => "g4 vim7 new", + 'G' => "g4 vim7 new", 'h' => "g3", 'H' => "g3", - 'i' => "g4 ext vim6 folding", - 'j' => "g2 ext vim6 folding", - 'k' => "g2 ext vim6 folding", + 'i' => "g4 vim6 new folding", + 'j' => "g2 vim6 new folding", + 'k' => "g2 vim6 new folding", 'l' => "g3", 'L' => "g3", '^m'=> "g3", - 'm' => "g4 ext vim6 folding", - 'M' => "g4 ext vim6 folding", - 'n' => "g4 ext vim6 folding", - 'N' => "g4 ext vim6 folding", - 'o' => "g4 ext vim6 folding", - 'O' => "g4 ext vim6 folding", - 'r' => "g4 ext vim6 folding", - 'R' => "g4 ext vim6 folding", + 'm' => "g4 vim6 new folding", + 'M' => "g4 vim6 new folding", + 'n' => "g4 vim6 new folding", + 'N' => "g4 vim6 new folding", + 'o' => "g4 vim6 new folding", + 'O' => "g4 vim6 new folding", + 'r' => "g4 vim6 new folding", + 'R' => "g4 vim6 new folding", 's' => "g3", 't' => "g3", - 'u' => "g4 arg ext vim7 new", - 'v' => "g4 ext vim6 folding", - 'w' => "g4 ext vim7 new", - 'W' => "g4 ext vim7 new", - 'x' => "g4 ext vim6 folding", - 'X' => "g4 ext vim6 folding", + 'u' => "g4 arg vim7 new", + 'v' => "g4 vim6 new folding", + 'w' => "g4 vim7 new", + 'W' => "g4 vim7 new", + 'x' => "g4 vim6 new folding", + 'X' => "g4 vim6 new folding", 'z' => "g3", }, # mode z @@ -735,12 +734,12 @@ def => { "\e"=> "g7 mode", - "`" => "g2 ext vim6", + "`" => "g2 vim6 new", '#' => "g2", '(' => "g2", '*' => "=[/", '/' => "g2", - "'" => "=[` ^", # ext vim6 + "'" => "=[` ^", # vim6 new '{' => "g2", '[' => "g2", '^['=> "=\e", @@ -757,9 +756,9 @@ def => { 'm' => "g2", 'p' => "g4", 'P' => "g4", - 's' => "g3 ext vim7 new", - 'S' => "g3 ext vim7 new", - 'z' => "g2 ext vim6 folding", + 's' => "g3 vim7 new", + 'S' => "g3 vim7 new", + 'z' => "g2 vim6 new folding", }, # mode [ ']' => { @@ -767,11 +766,11 @@ def => { "\e"=> "g7 mode", - "`" => "g2 ext vim6", + "`" => "g2 vim6 new", '#' => "g2", ')' => "g2", '*' => "=]/", - "'" => "=]` ^", # ext vim6 + "'" => "=]` ^", # vim6 new '/' => "g2", '[' => "g2", '^['=> "=\e", @@ -789,9 +788,9 @@ def => { 'm' => "g2", 'p' => "g4", 'P' => "=[p", - 's' => "g3 ext vim7 new", - 'S' => "g3 ext vim7 new", - 'z' => "g2 ext vim6 folding", + 's' => "g3 vim7 new", + 'S' => "g3 vim7 new", + 'z' => "g2 vim6 new folding", }, # mode ] '^w' => { @@ -816,7 +815,7 @@ def => { '^c'=> "g7 mode", 'd' => "g3", 'f' => "g4", - 'F' => "g4 ext vim7 new", + 'F' => "g4 vim7 new", 'g' => "g9 arg mode^wg", 'h' => "g3", 'H' => "g3", @@ -853,8 +852,8 @@ def => { ']' => "g3", '}' => "g3", '^]'=> "g3", - 'f' => "g4 ext vim7 new", - 'F' => "g4 ext vim7 new", + 'f' => "g4 vim7 new", + 'F' => "g4 vim7 new", }, # mode ^w g v => { @@ -868,24 +867,24 @@ def => { '<' => "g4", '=' => 'g4 undo', '>' => 'g4', - '~' => "g4 ext vim6", + '~' => "g4 vim6 new", '^['=> "=\e", '^]'=> "g3", '^\\'=>'^\\', - 'a' => 'g9 modeva arg ext vim6', - 'A' => 'g6 modei ext vim6', - '^a'=> 'g4 undo vim8 ext new', - 'c' => 'g6 modei ext vim6', - 'C' => 'g6 modei ext vim6', + 'a' => 'g9 modeva arg vim6 new', + 'A' => 'g6 modei vim6 new', + '^a'=> 'g4 undo vim8 new', + 'c' => 'g6 modei vim6 new', + 'C' => 'g6 modei vim6 new', '^c'=> "g7 mode", - 'd' => "g4 ext vim6", - 'D' => "g4 ext vim6", + 'd' => "g4 vim6 new", + 'D' => "g4 vim6 new", 'g' => "g9 arg modevg", '^g'=> "g8", '^h'=> 'g4', - 'i' => "g9 modeva arg ext vim6", - 'I' => "g6 modei ext vim6", # block + 'i' => "g9 modeva arg vim6 new", + 'I' => "g6 modei vim6 new", # block 'J' => "g4", 'K' => 'g4', 'o' => "g2", @@ -898,15 +897,15 @@ def => { 'R' => "=vS", # "might change in future" '^s'=> "=^s", 's' => "=vc", - 'S' => 'g6 modei ext vim6', - 'u' => "g4 ext vim6", - 'U' => "g4 ext vim6", + 'S' => 'g6 modei vim6 new', + 'u' => "g4 vim6 new", + 'U' => "g4 vim6 new", 'v' => "g8", 'V' => "g8", - '^v'=> "g8 ext vim6", + '^v'=> "g8 vim6 new", 'x' => "=vd", 'X' => "=vD", - '^x'=> 'g4 undo vim8 ext new', + '^x'=> 'g4 undo vim8 new', 'y' => "g4", 'Y' => "g4", @@ -923,14 +922,14 @@ def => { "\e"=> "g8 modev", '^['=> "=\e", - '?' => "g4 ext vim6", - '^a'=> 'g4 undo vim8 ext new', + '?' => "g4 vim6 new", + '^a'=> 'g4 undo vim8 new', '^g' => "g1 vim6", - 'J' => 'g4 ext vim6', - 'q' => "g4 ext vim6", + 'J' => 'g4 vim6 new', + 'q' => "g4 vim6 new", 'v' => "=gv", - 'w' => 'g4 ext vim7 new', - '^x'=> 'g4 undo vim8 ext new', + 'w' => 'g4 vim7 new', + '^x'=> 'g4 undo vim8 new', }, # mode v g va => { @@ -939,23 +938,23 @@ def => { '(' => "=vab", ')' => "=vab", '`' => "=va'", - "'" => 'g2 ext vim7 new', + "'" => 'g2 vim7 new', '"' => "=va'", - '<' => 'g2 ext vim6', + '<' => 'g2 vim6 new', '>' => "=va<", - '[' => 'g2 ext vim6', + '[' => 'g2 vim6 new', '{' => "=vaB", '^['=> "=\e", ']' => "=va[", '}' => "=vaB", - 'b' => 'g2 ext vim6', - 'B' => 'g2 ext vim6', - 'p' => 'g2 ext vim6', - 's' => 'g2 ext vim6', - 't' => 'g2 ext vim7 new', - 'w' => 'g2 ext vim6', - 'W' => 'g2 ext vim6', + 'b' => 'g2 vim6 new', + 'B' => 'g2 vim6 new', + 'p' => 'g2 vim6 new', + 's' => 'g2 vim6 new', + 't' => 'g2 vim7 new', + 'w' => 'g2 vim6 new', + 'W' => 'g2 vim6 new', }, # mode v a #c => { @@ -976,7 +975,7 @@ def => { # '^n' => "", #todo # '^p' => "", #todo # '^r' => "=i^r", # and then some... - # ## ["g4 arg ext vim6"], + # ## ["g4 arg vim6 new"], # '^q' => "=^q", # '^u' => "=i^u", # '^v' => "=i^v", @@ -988,38 +987,38 @@ def => { "\e" => "g7 mode", '^@' => "g4", - '^^' => "g4 ext vim6", + '^^' => "g4 vim6 new", '^['=> "=\e", - '^]' => "g4 ext vim6", - '^_' => "g4 ext vim6", + '^]' => "g4 vim6 new", + '^_' => "g4 vim6 new", '^\\'=>'^\\', - '^a' => "g4 ext vim6", - '^b' => "no ext vim6", + '^a' => "g4 vim6 new", + '^b' => "no vim6 new", '^c' => "g7 mode", '^d' => 'g4', - '^e' => "g4 ext vim6", + '^e' => "g4 vim6 new", '^f' => 'g4', '^g' => "g9 modei^g arg", '^h' => "g4", '^i' => "g4", '^j' => "g4", - '^k' => 'g4 arg arg ext vim6 linkdigraphs', - '^l' => "g7 mode ext vim6", # insertmode only + '^k' => 'g4 arg arg vim6 new linkdigraphs', + '^l' => "g7 mode vim6 new", # insertmode only '^m' => "g4", - '^n' => "g2 ext vim6", + '^n' => "g2 vim6 new", '^o' => 'g4', - '^p' => "g2 ext vim6", + '^p' => "g2 vim6 new", '^q' => "=^q", # or i^v - '^r' => 'g4 arg ext vim6', + '^r' => 'g4 arg vim6 new', '^s' => "=^s", '^t' => "g4", '^u' => "g4", '^v' => 'g4 linkcharset', '^w' => "g4", - '^x' => 'g9 arg modei^x ext vim6', - '^y' => "g4 ext vim6", - '^z' => "g1 ext vim6", # insertmode only + '^x' => 'g9 arg modei^x vim6 new', + '^y' => "g4 vim6 new", + '^z' => "g1 vim6 new", # insertmode only }, # modei 'i^g' => { @@ -1030,7 +1029,7 @@ def => { 'k' => 'g2', 'j' => 'g2', 'u' => 'g4', - 'U' => 'g4 vim8 ext new', + 'U' => 'g4 vim8 new', # other keys (even esc) are not recognized }, # mode i ^g @@ -1048,12 +1047,12 @@ def => { '^k' => 'g4', '^l' => 'g4', '^n' => 'g4', - '^o' => 'g4 ext vim7 new', + '^o' => 'g4 vim7 new', '^p' => 'g4', '^s' => 'g4', 's' => "=i^x^s", '^t' => 'g4', - '^u' => 'g4 ext vim7 new', + '^u' => 'g4 vim7 new', '^v' => 'g4', '^y' => "g3", }, # mode i ^x -- 2.30.0