about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Test/comptest3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 10e04fcb6..5651d1160 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-09  Bart Schaefer  <schaefer@brasslantern.com>
+
+	* 14824: Test/comptest: Avoid echotc (improvement on 14792).
+
 2001-06-08  Clint Adams  <clint@zsh.org>
 
 	* 14815: Src/utils.c: actually check the filename of
diff --git a/Test/comptest b/Test/comptest
index dea6a850d..d65ea351a 100644
--- a/Test/comptest
+++ b/Test/comptest
@@ -8,7 +8,6 @@ comptestinit () {
   zmodload -i zsh/zpty
 
   comptest_zsh=${ZSH:-zsh}
-  termcap_ce="$(echotc ce 2>/dev/null)"
 
   while getopts z: opt; do
     case $opt in
@@ -105,7 +104,7 @@ comptest () {
       log="${log[$mend[1]+1,-1]}"
       if (( 0 <= $mbegin[2] )); then
 	if [[ $match[2] != TC && $match[3] != \ # ]]; then
-	  print -lr "$match[2]:{${match[3]%$termcap_ce}}"
+	  print -lr "$match[2]:{${match[3]%${(%):-%E}}}"
 	fi
       elif (( 0 <= $mbegin[4] )); then
 	print -lr "DESCRIPTION:{$match[4]}"