diff options
| author | Peter Stephenson <pws@zsh.org> | 2015-08-24 10:18:56 +0100 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2015-08-24 10:18:56 +0100 |
| commit | 2bc4680e3b3973451b9449f970de35afdb105c37 (patch) | |
| tree | 0f51ad15656a74b98d27b923e76110365a99cb7b /Src/builtin.c | |
| parent | e5d5a76dce1cc488627c8623f0cd972c3d52644d (diff) | |
| parent | 2e69ece5cfab850b8ba00b272f35ccdaf727c781 (diff) | |
| download | zsh-2bc4680e3b3973451b9449f970de35afdb105c37.tar.gz zsh-2bc4680e3b3973451b9449f970de35afdb105c37.zip | |
Merge branch 'master' of https://git.code.sf.net/p/zsh/code
Diffstat (limited to 'Src/builtin.c')
| -rw-r--r-- | Src/builtin.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Src/builtin.c b/Src/builtin.c index 3d34aa74c..97022addf 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -5465,8 +5465,8 @@ bin_emulate(UNUSED(char *nam), char **argv, Options ops, UNUSED(int func)) /* with single argument set current emulation */ if (!argv[1]) { - emulate(shname, OPT_ISSET(ops,'R'), &emulation, opts); - if (OPT_ISSET(ops,'L')) + emulate(shname, opt_R, &emulation, opts); + if (opt_L) opts[LOCALOPTIONS] = opts[LOCALTRAPS] = opts[LOCALPATTERNS] = 1; clearpatterndisables(); return 0; @@ -5476,7 +5476,7 @@ bin_emulate(UNUSED(char *nam), char **argv, Options ops, UNUSED(int func)) memcpy(saveopts, opts, sizeof(opts)); memcpy(new_opts, opts, sizeof(opts)); savehackchar = keyboardhackchar; - emulate(shname, OPT_ISSET(ops,'R'), &new_emulation, new_opts); + emulate(shname, opt_R, &new_emulation, new_opts); optlist = newlinklist(); if (parseopts("emulate", &argv, new_opts, &cmd, optlist)) { ret = 1; @@ -5508,8 +5508,11 @@ bin_emulate(UNUSED(char *nam), char **argv, Options ops, UNUSED(int func)) goto restore2; } *--argv = cmd; /* on stack, never free()d, see execbuiltin() */ - } else + } else { + if (opt_L) + opts[LOCALOPTIONS] = opts[LOCALTRAPS] = opts[LOCALPATTERNS] = 1; return 0; + } save_sticky = sticky; sticky = hcalloc(sizeof(*sticky)); |