diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2009-02-11 20:42:15 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2009-02-11 20:42:15 +0000 |
| commit | c7d8b0dfb8ae9670e2bc11ecf563200069a3a12f (patch) | |
| tree | 822403086b3d6d77bb14846b6e286d59389da12c /Src/Modules | |
| parent | 0d02cf343eda943c32f7edfd24f28dbbd7004e32 (diff) | |
| download | zsh-c7d8b0dfb8ae9670e2bc11ecf563200069a3a12f.tar.gz zsh-c7d8b0dfb8ae9670e2bc11ecf563200069a3a12f.tar.xz zsh-c7d8b0dfb8ae9670e2bc11ecf563200069a3a12f.zip | |
26546, 26556: sticky emulation for functions defined in emulate ... -c ...
environments, plus documentation
Diffstat (limited to 'Src/Modules')
| -rw-r--r-- | Src/Modules/newuser.c | 2 | ||||
| -rw-r--r-- | Src/Modules/parameter.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Src/Modules/newuser.c b/Src/Modules/newuser.c index e19c34df3..cc020d5bd 100644 --- a/Src/Modules/newuser.c +++ b/Src/Modules/newuser.c @@ -78,7 +78,7 @@ boot_(UNUSED(Module m)) 0 }; const char **sp; - if (emulation != EMULATE_ZSH) + if (!EMULATION(EMULATE_ZSH)) return 0; if (!dotdir) { diff --git a/Src/Modules/parameter.c b/Src/Modules/parameter.c index e3fb909ea..38b462001 100644 --- a/Src/Modules/parameter.c +++ b/Src/Modules/parameter.c @@ -289,6 +289,7 @@ setfunction(char *name, char *val, int dis) shf = (Shfunc) zshcalloc(sizeof(*shf)); shf->funcdef = dupeprog(prog, 0); shf->node.flags = dis; + shf->emulation = sticky_emulation; if (!strncmp(name, "TRAP", 4) && (sn = getsignum(name + 4)) != -1) { |