--- execute_cmd.c.orig	Thu Mar 22 16:17:23 2001
+++ execute_cmd.c	Tue Apr 10 11:29:09 2001
@@ -2792,6 +2792,8 @@
   if (tc && (flags & CMD_IGNORE_RETURN))
     tc->flags |= CMD_IGNORE_RETURN;
 
+  old_shell_function = this_shell_function;
+
   if (subshell == 0)
     {
       begin_unwind_frame ("function_calling");
@@ -2878,6 +2880,8 @@
 
   if (variable_context == 0 || this_shell_function == 0)
     make_funcname_visible (0);
+
+  this_shell_function = old_shell_function;
 
   return (result);
 }