diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2014-09-29 17:52:33 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-09-29 17:52:33 -0700 |
| commit | 32473f59a38631c4bb2403d835b9e007c8a0ddc7 (patch) | |
| tree | 72df8959fcde37e5968a6c6301f8a98a9f860e5f /Src/zsh.h | |
| parent | 60e31a45b0c015d42e9dc8ca2c991930c3f7fd66 (diff) | |
| parent | 8cb67e721b3f02779bf4cf0d6a368f67c49c11f8 (diff) | |
| download | zsh-32473f59a38631c4bb2403d835b9e007c8a0ddc7.tar.gz zsh-32473f59a38631c4bb2403d835b9e007c8a0ddc7.tar.xz zsh-32473f59a38631c4bb2403d835b9e007c8a0ddc7.zip | |
Merge branch 'master' of git://git.code.sf.net/p/zsh/code
Conflicts: ChangeLog
Diffstat (limited to 'Src/zsh.h')
| -rw-r--r-- | Src/zsh.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Src/zsh.h b/Src/zsh.h index fa7396112..d284c7aa7 100644 --- a/Src/zsh.h +++ b/Src/zsh.h @@ -1139,6 +1139,7 @@ struct shfunc { char *filename; /* Name of file located in */ zlong lineno; /* line number in above file */ Eprog funcdef; /* function definition */ + Eprog redir; /* redirections to apply */ Emulation_options sticky; /* sticky emulation definitions, if any */ }; @@ -1820,7 +1821,8 @@ struct paramdef { */ enum { ASSPM_AUGMENT = 1 << 0, - ASSPM_WARN_CREATE = 1 << 1 + ASSPM_WARN_CREATE = 1 << 1, + ASSPM_ENV_IMPORT = 1 << 2 }; /* node for named directory hash table (nameddirtab) */ |