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

53368: ignore no-op changes to EMACS/VI options

Browse source
This commit is contained in:
Bart Schaefer 2025-03-02 11:23:22 -08:00
parent eb8e217f1b
commit d315401a03
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2025-03-02 Bart Schaefer <schaefer@toltec-ubuntu>
* 53368: Src/options.c: ignore no-op changes to EMACS/VI options
2025-02-28 Oliver Kiddle <opk@zsh.org>
* 53395: Completion/Unix/Type/_zfs_dataset,

8
Src/options.c
View file

@ -887,8 +887,14 @@ dosetopt(int optno, int value, int force, char *new_opts)
acquire_pgrp();
}
} else if ((optno == EMACSMODE || optno == VIMODE) && value) {
/* What's going on here:
* 1) unsetopt of either emacs or vi is an effective no-op.
* 2) setopt of either emacs or vi toggles off the other.
* Hence we disallow changing these options in emulation mode,
* but only if the change is setopt rather than unsetopt.
*/
if (sticky && sticky->emulation)
return -1;
return opts[optno] ? 0 : -1;
zleentry(ZLE_CMD_SET_KEYMAP, optno);
new_opts[(optno == EMACSMODE) ? VIMODE : EMACSMODE] = 0;
} else if (optno == SUNKEYBOARDHACK) {