From db3d3e2b271f2e49e191efaa80e91643ec7aae1d Mon Sep 17 00:00:00 2001
From: Bart Schaefer <barts@users.sourceforge.net>
Date: Thu, 8 Feb 2001 03:29:58 +0000
Subject: [PATCH] 13442: Use +Z to suppress loading of ZLE modules when
 testing.

---
 ChangeLog        | 6 ++++++
 Test/Makefile.in | 2 +-
 Test/comptest    | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 671661cf6..d031e32bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-07  Bart Schaefer  <schaefer@zsh.org>
+
+	* 13442: Test/Makefile.in, Test/comptest: Run zsh with +Z to
+	prevent ZLE modules from being loaded before $module_path is
+	changed to point at the test installation.
+
 2001-02-02  Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
 
 	* unposted: Src/mkmakemod.sh: patterns in 13412 were wrong.
diff --git a/Test/Makefile.in b/Test/Makefile.in
index 7861c8be0..5a66fe1ab 100644
--- a/Test/Makefile.in
+++ b/Test/Makefile.in
@@ -46,7 +46,7 @@ check test:
 	  $(MAKE) MODDIR=`pwd`/$(subdir)/Modules install.modules > /dev/null; \
 	fi
 	-for f in $(sdir)/$(TESTNUM)*.ztst; do \
-	  $(dir_top)/Src/zsh -f $(sdir)/ztst.zsh $$f; \
+	  $(dir_top)/Src/zsh +Z -f $(sdir)/ztst.zsh $$f; \
 	done
 	rm -rf Modules .zcompdump
 
diff --git a/Test/comptest b/Test/comptest
index a01b18134..85fa5578d 100644
--- a/Test/comptest
+++ b/Test/comptest
@@ -16,7 +16,7 @@ comptestinit () {
   (( OPTIND > 1 )) && shift $(( OPTIND - 1 ))
 
   export PS1="<PROMPT>"
-  zpty -b zsh "$comptest_zsh" -f
+  zpty -b zsh "$comptest_zsh -f +Z"
 
   zpty -r zsh log1 "*<PROMPT>*" || { 
     print "first prompt hasn't appeared."
@@ -29,6 +29,7 @@ comptestinit () {
 "fpath=( $fpath )" \
 'LISTMAX=10000000
 stty columns 80 rows 24
+setopt zle
 bindkey -e
 autoload -U compinit
 compinit -u