diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2012-03-07 06:10:42 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2012-03-07 06:10:42 +0000 |
| commit | fa8a0e241c8ac9eb48ab9fc2d8bb3105088e0db9 (patch) | |
| tree | e0369814c4201b9dfe4ca087620b574f4fb35059 /Src/options.c | |
| parent | a0d24f0bf3bfc7509557089bd6e0336f8da0494f (diff) | |
| download | zsh-fa8a0e241c8ac9eb48ab9fc2d8bb3105088e0db9.tar.gz zsh-fa8a0e241c8ac9eb48ab9fc2d8bb3105088e0db9.tar.xz zsh-fa8a0e241c8ac9eb48ab9fc2d8bb3105088e0db9.zip | |
30320: "emulate" accepts invocation-time flags; other small doc tweaks.
Diffstat (limited to 'Src/options.c')
| -rw-r--r-- | Src/options.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Src/options.c b/Src/options.c index 48df16045..c6db75372 100644 --- a/Src/options.c +++ b/Src/options.c @@ -767,6 +767,8 @@ dosetopt(int optno, int value, int force) return -1; #endif /* GETPWNAM_FAKED */ } else if ((optno == EMACSMODE || optno == VIMODE) && value) { + if (sticky_emulation) + return -1; zleentry(ZLE_CMD_SET_KEYMAP, optno); opts[(optno == EMACSMODE) ? VIMODE : EMACSMODE] = 0; } else if (optno == SUNKEYBOARDHACK) { |