From d109322359dc02e5008379da478628e2cace65e7 Mon Sep 17 00:00:00 2001
From: Sven Wischnowsky <wischnow@users.sourceforge.net>
Date: Tue, 1 Aug 2000 08:27:18 +0000
Subject: [PATCH] remove tests for kshautoload (use zcompile -z); fix for
 setting scriptname for functions that redefine themselves

---
 Completion/Commands/_next_tags | 2 +-
 Completion/User/_cvs           | 2 +-
 Completion/User/_mailboxes     | 2 +-
 Completion/X/_xset             | 2 +-
 Completion/X/_xwit             | 2 +-
 Src/exec.c                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Completion/Commands/_next_tags b/Completion/Commands/_next_tags
index 8afaa16f3..ffed800d0 100644
--- a/Completion/Commands/_next_tags
+++ b/Completion/Commands/_next_tags
@@ -138,4 +138,4 @@ _next_tags_pre() {
   fi
 }
 
-[[ -o kshautoload ]] || _next_tags "$@"
+_next_tags "$@"
diff --git a/Completion/User/_cvs b/Completion/User/_cvs
index 110b2520b..410cc4258 100644
--- a/Completion/User/_cvs
+++ b/Completion/User/_cvs
@@ -817,4 +817,4 @@ _cvs_nonexisting_entries () {
   }
 }
 
-[[ -o kshautoload ]] || _cvs "$@"
+_cvs "$@"
diff --git a/Completion/User/_mailboxes b/Completion/User/_mailboxes
index 8ee29007a..40b21e89f 100644
--- a/Completion/User/_mailboxes
+++ b/Completion/User/_mailboxes
@@ -175,4 +175,4 @@ _mua_mailboxes() {
   return ret
 }
 
-[[ -o kshautoload ]] || _mailboxes "$@"
+_mailboxes "$@"
diff --git a/Completion/X/_xset b/Completion/X/_xset
index e96b35aa8..819a2040d 100644
--- a/Completion/X/_xset
+++ b/Completion/X/_xset
@@ -195,4 +195,4 @@ _xset () {
   _xset_parse
 }
 
-[[ -o kshautoload ]] || _xset "$@"
+_xset "$@"
diff --git a/Completion/X/_xwit b/Completion/X/_xwit
index 3dbce455f..8676ef484 100644
--- a/Completion/X/_xwit
+++ b/Completion/X/_xwit
@@ -173,4 +173,4 @@ _xwit () {
   _xwit_parse
 }
 
-[[ -o kshautoload ]] || _xwit "$@"
+_xwit "$@"
diff --git a/Src/exec.c b/Src/exec.c
index a3e28d45d..c9a82f413 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -3189,7 +3189,7 @@ execautofn(Estate state, int do_exec)
 	return 1;
 
     oldscriptname = scriptname;
-    scriptname = dupstring(state->prog->shf->nam);
+    scriptname = dupstring(shf->nam);
     execode(shf->funcdef, 1, 0);
     scriptname = oldscriptname;