]>
Commit | Line | Data |
---|---|---|
35373510 | 1 | --- bash-2.04/execute_cmd.c.shellfunc Tue Jan 25 11:29:11 2000 |
2 | +++ bash-2.04/execute_cmd.c Tue May 2 21:26:24 2000 | |
2fce1949 | 3 | @@ -2855,6 +2855,7 @@ |
4 | int return_val, result; | |
5 | COMMAND *tc, *fc; | |
6 | char *debug_trap, *error_trap; | |
7 | + SHELL_VAR* old_shell_function; | |
8 | ||
9 | USE_VAR(fc); | |
10 | ||
11 | @@ -2862,6 +2862,8 @@ | |
35373510 | 12 | if (tc && (flags & CMD_IGNORE_RETURN)) |
13 | tc->flags |= CMD_IGNORE_RETURN; | |
14 | ||
15 | + old_shell_function = this_shell_function; | |
16 | + | |
17 | if (subshell == 0) | |
18 | { | |
19 | begin_unwind_frame ("function_calling"); | |
2fce1949 | 20 | @@ -2959,6 +2959,8 @@ |
35373510 | 21 | |
22 | if (variable_context == 0 || this_shell_function == 0) | |
23 | make_funcname_visible (0); | |
24 | + | |
25 | + this_shell_function = old_shell_function; | |
26 | ||
27 | return (result); | |
28 | } |