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

50851: restore typtab when necessary

Browse source 
inittyptab() must be called when returning from a function with
"setopt localoptions MULTIBYTE|BANGHIST|SHSTDIN", and also in
function dosetopt() when setting these options (via $options, for
example). We intentionally did not take account of the options
EMACS/VI because these options are obsolete and their use is
not recommended.
This commit is contained in:
Jun-ichi Takimoto 2022-11-02 16:27:27 +09:00
parent 7a2e3b9039
commit f8d93888a8
4 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2022-11-02 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
* 50851: Doc/Zsh/options.yo, Src/exec.c, Src/options.c: restore
state (such as typtab) when returning from a function with
localoptions (but do not take care of EMACS/VI options).
2022-10-31 Bart Schaefer <schaefer@zsh.org>
* 50855: Doc/Zsh/builtins.yo, Doc/Zsh/params.yo: Clarify how

16
Doc/Zsh/options.yo
View file

@ -2550,10 +2550,12 @@ pindex(NO_EMACS)
pindex(NOEMACS)
item(tt(EMACS))(
If ZLE is loaded, turning on this option has the equivalent effect
of `tt(bindkey -e)'. In addition, the VI option is unset.
of `tt(bindkey -e)'. In addition, the tt(VI) option is unset.
Turning it off has no effect. The option setting is
not guaranteed to reflect the current keymap. This option is
provided for compatibility; tt(bindkey) is the recommended interface.
not guaranteed to reflect the current keymap, and the tt(LOCALOPTIONS)
option does not work correctly. This option is provided only for
compatibility, and its use is highly discouraged. tt(bindkey) is the
recommended interface.
)
pindex(OVERSTRIKE)
pindex(NO_OVERSTRIKE)
@ -2582,10 +2584,12 @@ pindex(NO_VI)
pindex(NOVI)
item(tt(VI))(
If ZLE is loaded, turning on this option has the equivalent effect
of `tt(bindkey -v)'. In addition, the EMACS option is unset.
of `tt(bindkey -v)'. In addition, the tt(EMACS) option is unset.
Turning it off has no effect. The option setting is
not guaranteed to reflect the current keymap. This option is
provided for compatibility; tt(bindkey) is the recommended interface.
not guaranteed to reflect the current keymap, and the tt(LOCALOPTIONS)
option does not work correctly. This option is provided only for
compatibility, and its use is highly discouraged. tt(bindkey) is the
recommended interface.
)
pindex(ZLE)
pindex(NO_ZLE)

12
Src/exec.c
View file

@ -5961,11 +5961,23 @@ doshfunc(Shfunc shfunc, LinkList doshargs, int noreturnval)
emulation = funcsave->emulation;
sticky = funcsave->sticky;
} else if (isset(LOCALOPTIONS)) {
/* we need to call inittyptab() if these options change */
int init_typtab =
#ifdef MULTIBYTE_SUPPORT
funcsave->opts[MULTIBYTE] != opts[MULTIBYTE] ||
#endif
funcsave->opts[BANGHIST] != opts[BANGHIST] ||
funcsave->opts[SHINSTDIN] != opts[SHINSTDIN];
/* take care of SUNKEYBOARDHACK but not of EMACS/VI */
if (funcsave->opts[SUNKEYBOARDHACK] != opts[SUNKEYBOARDHACK])
keyboardhackchar = funcsave->opts[SUNKEYBOARDHACK] ? '`' : '\0';
/* restore all shell options except PRIVILEGED and RESTRICTED */
funcsave->opts[PRIVILEGED] = opts[PRIVILEGED];
funcsave->opts[RESTRICTED] = opts[RESTRICTED];
memcpy(opts, funcsave->opts, sizeof(opts));
emulation = funcsave->emulation;
if (init_typtab)
inittyptab();
} else {
/* just restore a couple. */
opts[XTRACE] = funcsave->opts[XTRACE];

6
Src/options.c
View file

@ -904,7 +904,11 @@ dosetopt(int optno, int value, int force, char *new_opts)
keyboardhackchar = (value ? '`' : '\0');
}
new_opts[optno] = value;
if (optno == BANGHIST || optno == SHINSTDIN)
if (
#ifdef MULTIBYTE_SUPPORT
optno == MULTIBYTE ||
#endif
optno == BANGHIST || optno == SHINSTDIN)
inittyptab();
return 0;
}