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

53399: don't load ZLE early to set keymap

Browse source 
When zsh is run with -o vi / -o emacs, instead of loading ZLE to force
the change, only record the option state. Then when ZLE starts, the vi
option determines the default keymap.
This commit is contained in:
Oliver Kiddle 2025-03-03 01:24:46 +01:00
parent 71f35afa1c
commit 435cb1b748
5 changed files with 18 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2025-03-03 Oliver Kiddle <opk@zsh.org>
* 53399: Src/Zle/zle_keymap.c, Src/builtin.c, Src/init.c,
Src/options.c: don't load ZLE early to set keymap
* 53394: Src/Zle/zle_keymap.c: drop OSC and DCS sequences in key
input as they are likely to be terminal query responses not keys

5
Src/Zle/zle_keymap.c
View file

@ -1452,7 +1452,10 @@ default_bindings(void)
linkkeymap(oppmap, "viopp", 0);
linkkeymap(vismap, "visual", 0);
linkkeymap(smap, ".safe", 1);
linkkeymap(emap, "main", 0);
if (isset(VIMODE))
linkkeymap(vmap, "main", 0);
else
linkkeymap(emap, "main", 0);
/* the .safe map cannot be modified or deleted */
smap->flags |= KM_IMMUTABLE;

2
Src/builtin.c
View file

@ -6333,7 +6333,7 @@ bin_emulate(char *nam, char **argv, Options ops, UNUSED(int func))
savehackchar = keyboardhackchar;
emulate(shname, opt_R, &new_emulation, new_opts);
optlist = newlinklist();
if (parseopts(nam, &argv, new_opts, &cmd, optlist, 0, NULL)) {
if (parseopts(nam, &argv, new_opts, &cmd, optlist, 0)) {
ret = 1;
goto restore;
}

30
Src/init.c
View file

@ -255,8 +255,7 @@ static char *argv0;
/**/
static void
parseargs(char *zsh_name, char **argv, char **runscript, char **cmdptr,
int *needkeymap)
parseargs(char *zsh_name, char **argv, char **runscript, char **cmdptr)
{
char **x;
LinkList paramlist;
@ -273,7 +272,7 @@ parseargs(char *zsh_name, char **argv, char **runscript, char **cmdptr,
* matched by code at the end of the present function.
*/
if (parseopts(zsh_name, &argv, opts, cmdptr, NULL, flags, needkeymap))
if (parseopts(zsh_name, &argv, opts, cmdptr, NULL, flags))
exit(1);
/*
@ -384,7 +383,7 @@ static void parseopts_setemulate(char *nam, int flags)
/**/
mod_export int
parseopts(char *nam, char ***argvp, char *new_opts, char **cmdp,
LinkList optlist, int flags, int *needkeymap)
LinkList optlist, int flags)
{
int optionbreak = 0;
int action, optno;
@ -490,14 +489,8 @@ parseopts(char *nam, char ***argvp, char *new_opts, char **cmdp,
return 1;
} else if (optno == RESTRICTED && toplevel) {
restricted = action;
} else if ((optno == EMACSMODE || optno == VIMODE)
&& (!toplevel || needkeymap)){
if (!toplevel) {
WARN_OPTION("can't change option: %s", *argv);
} else {
/* Need to wait for modules to be loadable */
*needkeymap = optno;
}
} else if ((optno == EMACSMODE || optno == VIMODE) && !toplevel) {
WARN_OPTION("can't change option: %s", *argv);
} else {
if (dosetopt(optno, action, toplevel, new_opts) &&
!toplevel) {
@ -1864,7 +1857,7 @@ zsh_main(UNUSED(int argc), char **argv)
{
char **t, *runscript = NULL, *zsh_name;
char *cmd; /* argument to -c */
int t0, needkeymap = 0;
int t0;
#ifdef USE_LOCALE
setlocale(LC_ALL, "");
#endif
@ -1910,7 +1903,7 @@ zsh_main(UNUSED(int argc), char **argv)
createoptiontable();
/* sets emulation, LOGINSHELL, PRIVILEGED, ZLE, INTERACTIVE,
* SHINSTDIN and SINGLECOMMAND */
parseargs(zsh_name, argv, &runscript, &cmd, &needkeymap);
parseargs(zsh_name, argv, &runscript, &cmd);
SHTTY = -1;
init_io(cmd);
@ -1919,15 +1912,6 @@ zsh_main(UNUSED(int argc), char **argv)
init_signals();
init_bltinmods();
init_builtins();
if (needkeymap)
{
/* Saved for after module system initialisation */
zleentry(ZLE_CMD_SET_KEYMAP, needkeymap);
opts[needkeymap] = 1;
opts[needkeymap == EMACSMODE ? VIMODE : EMACSMODE] = 0;
}
run_init_scripts();
setupshin(runscript);
init_misc(cmd, zsh_name);

5
Src/options.c
View file

@ -895,8 +895,9 @@ dosetopt(int optno, int value, int force, char *new_opts)
*/
if (sticky && sticky->emulation)
return opts[optno] ? 0 : -1;
zleentry(ZLE_CMD_SET_KEYMAP, optno);
new_opts[(optno == EMACSMODE) ? VIMODE : EMACSMODE] = 0;
if (zle_load_state == 1)
zleentry(ZLE_CMD_SET_KEYMAP, optno);
new_opts[optno ^ EMACSMODE ^ VIMODE] = 0;
} else if (optno == SUNKEYBOARDHACK) {
/* for backward compatibility */
keyboardhackchar = (value ? '`' : '\0');