mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-18 14:06:03 +02:00
Code

51557: Clarify availability of ksh-mode parameters, improve vi-mode detection.

This commit is contained in:
Bart Schaefer 2023-03-11 13:20:21 -08:00
parent 8424fe5e23
commit 25dceb1dea
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2023-03-11 Bart Schaefer <schaefer@zsh.org>
* 51557: Doc/zsh/mod_ksh93.yo, Src/Modules/ksh93.c: Clarify
availability of ksh-mode parameters, improve vi-mode detection.
2023-03-07 Bart Schaefer <schaefer@zsh.org>
* 51534: Util/printdefines: update for recent changes

8
Doc/Zsh/mod_ksh93.yo
View File

@ -24,8 +24,10 @@ enditem()
subsect(Ksh Parameters)
cindex(parameters, ksh)
Parameters supplied by this module that are marked with `<K>' below are
available only in ksh emulation.
Parameters supplied by this module that are marked with `<K>' below
are available only when ksh emulation is active before entry to the
shell function, that is, `tt(emulate ksh)' locally to a function does
not populate these parameters for that function.
startitem()
vindex(.sh.command)
@ -45,7 +47,7 @@ A named reference to the ZLE special parameter `tt(CURSOR)'.
vindex(.sh.edmode)
item(tt(.sh.edmode) <K>)(
In a ZLE widget, this parameter has the value tt(ESC) (tt($'\e')) if the
`tt(main)' keymap is selected, and the empty string otherwise. This is
tt(VI) option is set and the `tt(main)' keymap is selected. This is
intended for use with vi-mode key bindings (`tt(bindkey -v)'). In a
future revision, assigning `tt(.sh.edchar=${.sh.edmode})' is expected
to initiate `tt(vicmd)' mode when `tt(viins)' is active, and do

5
Src/Modules/ksh93.c
View File

@ -168,8 +168,9 @@ ksh93_wrapper(Eprog prog, FuncWrap w, char *name)
if (zleactive) {
extern mod_import_variable char *curkeymapname; /* XXX */
extern mod_import_variable char *varedarg; /* XXX */
/* How to distinguish emacs bindings? */
if (curkeymapname && strcmp(curkeymapname, "main") == 0)
/* bindkey -v forces VIMODE so this test is as good as any */
if (curkeymapname && isset(VIMODE) &&
strcmp(curkeymapname, "main") == 0)
strcpy(sh_edmode, "\e");
else
strcpy(sh_edmode, "");