From ae0b56cdda382732abc7c657e14f36a1e3d4d302 Mon Sep 17 00:00:00 2001
From: "Barton E. Schaefer" <schaefer@zsh.org>
Date: Sat, 15 Feb 2014 13:45:35 -0800
Subject: 32389 (with Jun Takimoto): additional PTY and keybinding adjustments

---
 Test/X02zlevi.ztst | 4 ++--
 Test/comptest      | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'Test')

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]}"
 }
-- 
cgit 1.4.1