diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 1999-04-15 18:15:04 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-04-15 18:15:04 +0000 |
| commit | ba4f5e80ec9d7e145718e79fed6e57a852c86c12 (patch) | |
| tree | ae29f2dfb81bb4e20b015610d85ce5f5a2d96eda /Src/builtin.c | |
| parent | 850fb2e7f94b4e0e9fbf3538ad9e3c44c9fed74b (diff) | |
| download | zsh-ba4f5e80ec9d7e145718e79fed6e57a852c86c12.tar.gz zsh-ba4f5e80ec9d7e145718e79fed6e57a852c86c12.tar.xz zsh-ba4f5e80ec9d7e145718e79fed6e57a852c86c12.zip | |
zsh-3.1.5-pws-8 zsh-3.1.5-pws-8
Diffstat (limited to 'Src/builtin.c')
| -rw-r--r-- | Src/builtin.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Src/builtin.c b/Src/builtin.c index 2b77c57bc..fc9b113ca 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -56,7 +56,7 @@ static struct builtin builtins[] = BUILTIN("disown", 0, bin_fg, 0, -1, BIN_DISOWN, NULL, NULL), BUILTIN("echo", BINF_PRINTOPTS | BINF_ECHOPTS, bin_print, 0, -1, BIN_ECHO, "neE", "-"), BUILTIN("echotc", 0, bin_echotc, 1, -1, 0, NULL, NULL), - BUILTIN("emulate", 0, bin_emulate, 1, 1, 0, "R", NULL), + BUILTIN("emulate", 0, bin_emulate, 1, 1, 0, "LR", NULL), BUILTIN("enable", 0, bin_enable, 0, -1, BIN_ENABLE, "afmr", NULL), BUILTIN("eval", BINF_PSPECIAL, bin_eval, 0, -1, BIN_EVAL, NULL, NULL), BUILTIN("exit", BINF_PSPECIAL, bin_break, 0, 1, BIN_EXIT, NULL, NULL), @@ -643,7 +643,7 @@ set_pwd_env(void) pm = (Param) paramtab->getnode(paramtab, "OLDPWD"); if (!(pm->flags & PM_EXPORTED)) { pm->flags |= PM_EXPORTED; - pm->env = addenv("PWD", pwd); + pm->env = addenv("OLDPWD", oldpwd); } } @@ -3051,6 +3051,8 @@ int bin_emulate(char *nam, char **argv, char *ops, int func) { emulate(*argv, ops['R']); + if (ops['L']) + dosetopt(LOCALOPTIONS, 1, 0); return 0; } |