mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-28 05:00:59 +01:00
Code Releases Activity

30726: make shell options passed to emulate stick along with the emulation

Browse source
This commit is contained in:
Peter Stephenson 2012-10-11 20:14:01 +00:00
parent ad92cb3203
commit 4b86cc48f7
12 changed files with 287 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Src/options.c
View file

@ -35,29 +35,21 @@
/**/
mod_export int emulation;
/* current sticky emulation: 0 means none */
/* current sticky emulation: sticky = NULL means none */
/**/
mod_export int sticky_emulation;
mod_export Emulation_options sticky;
/* the options; e.g. if opts[SHGLOB] != 0, SH_GLOB is turned on */
/**/
mod_export char opts[OPT_SIZE];
/*
* the options that need setting for current sticky emulation, if any:
* same format as opts.
*/
/**/
mod_export char sticky_opts[OPT_SIZE];
/* Option name hash table */
/**/
mod_export HashTable optiontab;
/* The canonical option name table */
#define OPT_CSH EMULATE_CSH
@ -786,7 +778,7 @@ dosetopt(int optno, int value, int force, char *new_opts)
return -1;
#endif /* GETPWNAM_FAKED */
} else if ((optno == EMACSMODE || optno == VIMODE) && value) {
if (sticky_emulation)
if (sticky && sticky->emulation)
return -1;
zleentry(ZLE_CMD_SET_KEYMAP, optno);
new_opts[(optno == EMACSMODE) ? VIMODE : EMACSMODE] = 0;