X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/79d144c6834749e1e61c8ed1a9a60c8e4cc30a0d..aff24d1391a688cdef38674f3f10c4842d84fa1a:/vi.inc.pl

diff --git a/vi.inc.pl b/vi.inc.pl
index 02465d8..d0c259f 100644
--- a/vi.inc.pl
+++ b/vi.inc.pl
@@ -2,7 +2,6 @@ use utf8;
 {
 
 '' => {
-	"\e"=> ["mo mode"],
 	'~' => ["co undo"],
 	'!' => ["co argm undo modec"],
 	'@' => ["co arg undo"],
@@ -122,6 +121,8 @@ use utf8;
 g => {
 	lead => "g",
 
+	"\e"=> ["mo mode"],
+
 	'~' => ["co argm ext vim6"],
 	'@' => ["co ext vim7 new"],
 	'#' => ["pm ext vim6"],
@@ -184,7 +185,8 @@ g => {
 Z => {
 	lead => "Z",
 
-	'^['=> ["mo mode"],
+	"\e"=> ["mo mode"],
+	'^['=> "\e",
 
 	'Q' => ["co ext vim6"],
 	'Z' => ["co"],
@@ -193,12 +195,14 @@ Z => {
 z => {
 	lead => "z",
 
+	"\e"=> ["mo mode"],
+
 	'^' => ["po"],
 	'+' => ["po"],
 	'-' => ["po"],
 	'=' => ["co ext vim7 new"],
 	'.' => ["po"],
-	'^['=> ["mo mode"],
+	'^['=> "\e",
 
 	'a' => ["co ext vim6 folding"],
 	'A' => ["co ext vim6 folding"],
@@ -243,6 +247,8 @@ z => {
 '[' => {
 	lead => "[",
 
+	"\e"=> ["mo mode"],
+
 	"`" => ["pm ext vim6"],
 	'#' => ["pm"],
 	'(' => ["pm"],
@@ -251,7 +257,7 @@ z => {
 	"'" => "[` ^", # ext vim6
 	'{' => ["pm"],
 	'[' => ["pm"],
-	'^['=> ["mo mode"],
+	'^['=> "\e",
 	']' => ["pm"],
 
 	'c' => ["pm"],
@@ -273,6 +279,8 @@ z => {
 ']' => {
 	lead => "]",
 
+	"\e"=> ["mo mode"],
+
 	"`" => ["pm ext vim6"],
 	'#' => ["pm"],
 	')' => ["pm"],
@@ -280,7 +288,7 @@ z => {
 	"'" => "]` ^", # ext vim6
 	'/' => ["pm"],
 	'[' => ["pm"],
-	'^['=> ["mo mode"],
+	'^['=> "\e",
 	']' => ["pm"],
 	'}' => ["pm"],
 
@@ -303,6 +311,8 @@ z => {
 '^w' => {
 	lead => $ascii ? "'w"  : "ŵ",
 
+	"\e"=> ["mo mode"],
+
 	'<' => ["po"],
 	'>' => ["po"],
 	'^' => ["co"],
@@ -310,7 +320,7 @@ z => {
 	'+' => ["po"],
 	'-' => ["po"],
 	'=' => ["po"],
-	'^['=> ["mo mode"],
+	'^['=> "\e",
 	']' => ["po"],
 	'}' => ["po"],
 	'|' => ["po"],
@@ -351,7 +361,8 @@ z => {
 '^wg' => {
 	lead => $ascii ? "'wg" : "ŵg",
 
-	'^['=> ["mo mode"],
+	"\e"=> ["mo mode"],
+	'^['=> "\e",
 	']' => ["po"],
 	'}' => ["po"],
 	'^]'=> ["po"],
@@ -360,13 +371,15 @@ z => {
 }, # mode ^w g
 
 v => {
+	"\e"=> ["mo mode"],
+
 	'!' => ["co"],
 	':' => ["mo modec"],
 	'<' => ["co"],
 	'=' => ['co undo'],
 	'>' => ['co'],
 	'~' => ["co ext vim6"],
-	'^['=> ["mo mode"],
+	'^['=> "\e",
 	'^]'=> ["po"],
 	'^\\'=>'^\\',
 
@@ -415,7 +428,9 @@ v => {
 vg => {
 	lead => "g",
 
-	'^['=> ["mv modev"],
+	"\e"=> ["mv modev"],
+
+	'^['=> "\e",
 	'?' => ["co ext vim6"],
 	'J' => ['co ext vim6'],
 	'q' => ["co ext vim6"],
@@ -424,6 +439,8 @@ vg => {
 }, # mode v g
 
 va => {
+	"\e"=> ["mv modev"],
+
 	'(' => 'vab',
 	')' => 'vab',
 	'`' => "va'",
@@ -433,7 +450,7 @@ va => {
 	'>' => 'va&lt;',
 	'[' => ['pm ext vim6'],
 	'{' => 'vaB',
-	'^['=> ['mv modev'],
+	'^['=> "\e",
 	']' => 'va[',
 	'}' => 'vaB',
 
@@ -473,9 +490,11 @@ va => {
 #}, # mode c
 
 i => {
+	"\e" => ["mo mode"],
+
 	'^@' => ["co"],
 	'^^' => ["co ext vim6"],
-	'^[' => ["mo mode"],
+	'^['=> "\e",
 	'^]' => ["co ext vim6"],
 	'^_' => ["co ext vim6"],
 	'^\\'=>'^\\',
@@ -511,6 +530,8 @@ i => {
 'i^g' => {
 	lead => $ascii ? "'g"  : "ĝ",
 
+	"\e"=> ['mi modei'],
+
 	'k' => ['pm'],
 	'j' => ['pm'],
 	'u' => ['co'],
@@ -520,7 +541,9 @@ i => {
 'i^x' => {
 	lead => $ascii ? "'x"  : "x̂",
 
-	'^[' => ["mo mode"], # yes, it really leaves insert mode
+	"\e" => ["mo mode"], # yes, it really leaves insert mode
+
+	'^['=> "\e",
 	'^]' => ['co'],
 	'^d' => ['co'],
 	'^e' => ["po"],