about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Test/X02zlevi.ztst1
-rw-r--r--Test/comptest2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3bd65cc20..f86b3a0fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-07  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
+
+	* 33829: Test/X02zlevi.ztst, Test/comptest: unbind ESC~ as
+	a more reliable workaround
+
 2014-12-06  Mikael Magnusson  <mikachu@gmail.com>
 
 	* 33882: Completion/Unix/Command/_gcc: Complete CXXFLAGS as
diff --git a/Test/X02zlevi.ztst b/Test/X02zlevi.ztst
index 520431193..4f2f3193d 100644
--- a/Test/X02zlevi.ztst
+++ b/Test/X02zlevi.ztst
@@ -37,6 +37,7 @@
 >3
 >CURSOR: 5
 
+  zpty_run 'bindkey -r "\e~"'
   zletest $'\e' $'~aI\e' $'~o\e' \~
 0:swap case on a blank line
 >BUFFER: i
diff --git a/Test/comptest b/Test/comptest
index 1f4dac682..9c92f96ec 100644
--- a/Test/comptest
+++ b/Test/comptest
@@ -162,7 +162,7 @@ comptest () {
 zletest () {
   local first=0
   for input; do
-    zpty_flush Before zletest
+    # zpty_flush Before zletest
     # sleep for $KEYTIMEOUT
     (( first++ )) && read -t 0.011 -k 1 < /dev/null
     zpty -n -w zsh "$input"