about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2000-12-18 02:14:57 +0000
committerBart Schaefer <barts@users.sourceforge.net>2000-12-18 02:14:57 +0000
commitbf23eb259cb859d7b12a258cbdb6ae3a7215673b (patch)
tree00509d095233a008ad7903884dea504d19102c0c
parentef13567352fe6f583109684f24cb77d12fe3af0a (diff)
downloadzsh-bf23eb259cb859d7b12a258cbdb6ae3a7215673b.tar.gz
zsh-bf23eb259cb859d7b12a258cbdb6ae3a7215673b.tar.xz
zsh-bf23eb259cb859d7b12a258cbdb6ae3a7215673b.zip
Back out 13285.
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/zle_bindings.c4
-rw-r--r--Src/Zle/zle_keymap.c8
3 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 75c56d40d..b7cb72113 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-17  Bart Schaefer  <schaefer@zsh.org>
+
+	* Zefram: 13290: Src/Zle/zle_bindings.c, Src/Zle/zle_keymap.c:
+	Back out 13285.
+
 2000-12-17  Clint Adams  <schizo@debian.org>
 
 	* 13288: Src/Modules/zftp.c: cast pointers when calling
diff --git a/Src/Zle/zle_bindings.c b/Src/Zle/zle_bindings.c
index 67acc15f9..e95061df2 100644
--- a/Src/Zle/zle_bindings.c
+++ b/Src/Zle/zle_bindings.c
@@ -396,8 +396,8 @@ int vicmdbind[128] = {
     /* g */ z_undefinedkey,
     /* h */ z_vibackwardchar,
     /* i */ z_viinsert,
-    /* j */ z_vidownlineorhistory,
-    /* k */ z_viuplineorhistory,
+    /* j */ z_downlineorhistory,
+    /* k */ z_uplineorhistory,
     /* l */ z_viforwardchar,
     /* m */ z_visetmark,
     /* n */ z_virepeatsearch,
diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c
index 09601eb6d..28203655e 100644
--- a/Src/Zle/zle_keymap.c
+++ b/Src/Zle/zle_keymap.c
@@ -1067,12 +1067,12 @@ default_bindings(void)
      * Both standard and keypad modes are supported.                  */
 
     /* vi command mode: arrow keys */
-    bindkey(amap, "\33[A",  refthingy(t_viuplineorhistory), NULL);
-    bindkey(amap, "\33[B",  refthingy(t_vidownlineorhistory), NULL);
+    bindkey(amap, "\33[A",  refthingy(t_uplineorhistory), NULL);
+    bindkey(amap, "\33[B",  refthingy(t_downlineorhistory), NULL);
     bindkey(amap, "\33[C",  refthingy(t_viforwardchar), NULL);
     bindkey(amap, "\33[D",  refthingy(t_vibackwardchar), NULL);
-    bindkey(amap, "\33OA",  refthingy(t_viuplineorhistory), NULL);
-    bindkey(amap, "\33OB",  refthingy(t_vidownlineorhistory), NULL);
+    bindkey(amap, "\33OA",  refthingy(t_uplineorhistory), NULL);
+    bindkey(amap, "\33OB",  refthingy(t_downlineorhistory), NULL);
     bindkey(amap, "\33OC",  refthingy(t_viforwardchar), NULL);
     bindkey(amap, "\33OD",  refthingy(t_vibackwardchar), NULL);