about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2014-02-15 13:45:35 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2014-02-15 13:45:35 -0800
commitae0b56cdda382732abc7c657e14f36a1e3d4d302 (patch)
tree30f1f24c32a8e090bb1109b9cb5a892d97f17059
parent90916c4e085138da26c34b1d0da826f7804293f7 (diff)
downloadzsh-ae0b56cdda382732abc7c657e14f36a1e3d4d302.tar.gz
zsh-ae0b56cdda382732abc7c657e14f36a1e3d4d302.tar.xz
zsh-ae0b56cdda382732abc7c657e14f36a1e3d4d302.zip
32389 (with Jun Takimoto): additional PTY and keybinding adjustments
-rw-r--r--ChangeLog5
-rw-r--r--Test/X02zlevi.ztst4
-rw-r--r--Test/comptest8
3 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 848527bdb..14aac0671 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-15  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 32389 (with Jun Takimoto): Test/X02zlevi.ztst, Test/comptest:
+	additional PTY and keybinding adjustments
+
 2014-02-14  Oliver Kiddle <opk@zsh.org>
 
 	* 32361: Src/Zle/zle_tricky.c: don't reset lastline before completion
diff --git a/Test/X02zlevi.ztst b/Test/X02zlevi.ztst
index fe55d8a26..60f878e46 100644
--- a/Test/X02zlevi.ztst
+++ b/Test/X02zlevi.ztst
@@ -49,8 +49,8 @@
 >BUFFER: z
 >CURSOR: 1
 
-  comptesteval 'bindkey -a "^R" redo'
-  zletest $'123\C-_\e\C-r'
+  comptesteval 'bindkey -a "^K" redo'
+  zletest $'123\C-_\e\C-k'
 0:undo in insert mode, redo in command
 >BUFFER: 123
 >CURSOR: 2
diff --git a/Test/comptest b/Test/comptest
index 42fe651d7..48b6cdfea 100644
--- a/Test/comptest
+++ b/Test/comptest
@@ -106,7 +106,7 @@ comptesteval () {
   local tmp=/tmp/comptest.$$
 
   print -lr - "$@" > $tmp
-  zpty_flush Before comptesteval
+  # zpty_flush Before comptesteval
   zpty -w zsh ". $tmp"
   zpty -r -m zsh log_eval "*<PROMPT>*" || {
     print "prompt hasn't appeared."
@@ -118,13 +118,11 @@ comptesteval () {
 
 comptest () {
   input="$*"
-  zpty_flush Before comptest
   zpty -n -w zsh "$input"$'\C-Z'
   zpty -r -m zsh log "*<WIDGET><finish>*<PROMPT>*" || {
     print "failed to invoke finish widget."
     return 1
   }
-  zpty_flush After comptest
 
   logs=(${(s:<WIDGET>:)log})
   shift logs
@@ -154,12 +152,12 @@ comptest () {
 
 zletest () {
   input="$*"
-  zpty_flush Before zletest
+  # zpty_flush Before zletest
   zpty -n -w zsh "$input"$'\C-X'
   zpty -r -m zsh log "*<WIDGET><finish>*<PROMPT>*" || {
     print "failed to invoke finish widget."
     return 1
   }
-  zpty_flush After zletest
+  # zpty_flush After zletest
   print -lr "${(@)${(ps:\r\n:)log##*<WIDGET><finish>}[1,-2]}"
 }