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

27085: add accept-search handling to scrollist keymap

Browse source
This commit is contained in:
Peter Stephenson 2009-07-01 17:09:37 +00:00
parent 041057687f
commit 55e4beb8d8
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,11 +1,15 @@
2009-07-01 Peter Stephenson <pws@csr.com> 2009-07-01 Peter Stephenson <pws@csr.com>
* 27085: Doc/Zsh/mod_complist.yo, Src/Zle/complist.c:
in scrollist keymap allow accept-search to exit but do nothing
else.
* 27083: Doc/Zsh/builtins.yo, Src/builtin.c, Src/init.c, * 27083: Doc/Zsh/builtins.yo, Src/builtin.c, Src/init.c,
Src/zsh.h, Src/Modules/newuser.c, Test/A01grammar.ztst: "." Src/zsh.h, Src/Modules/newuser.c, Test/A01grammar.ztst: "."
returns status 128 on execution failure, 129 on failure to find returns status 128 on execution failure, 129 on failure to find
file. file.
* 27080: Doc/Zsh/Zsh/mod_complist.yo, Src/Zle/complist.c: it * 27080: Doc/Zsh/mod_complist.yo, Src/Zle/complist.c: it
wasn't possible to exit menu selection cleanly. wasn't possible to exit menu selection cleanly.
2009-07-01 Peter Stephenson <pws@csr.com> 2009-07-01 Peter Stephenson <pws@csr.com>
@ -11886,5 +11890,5 @@
***************************************************** *****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL * This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.4723 $ * $Revision: 1.4724 $
***************************************************** *****************************************************

3
Doc/Zsh/mod_complist.yo
View file

@ -193,6 +193,9 @@ xitem(tt(complete-word), tt(menu-complete), tt(expand-or-complete))
item(tt(expand-or-complete-prefix), tt(menu-complete-or-expand))( item(tt(expand-or-complete-prefix), tt(menu-complete-or-expand))(
scrolls forward one screenful scrolls forward one screenful
) )
item(tt(accept-search))(
stop listing but take no other action
)
enditem() enditem()
Every other character stops listing and immediately processes the key Every other character stops listing and immediately processes the key

2
Src/Zle/complist.c
View file

@ -974,6 +974,8 @@ asklistscroll(int ml)
!strcmp(cmd->nam, "menu-complete") || !strcmp(cmd->nam, "menu-complete") ||
!strcmp(cmd->nam, "menu-expand-or-complete")) !strcmp(cmd->nam, "menu-expand-or-complete"))
mrestlines = lines - 1; mrestlines = lines - 1;
else if (cmd == Th(z_acceptsearch))
ret = 1;
else { else {
ungetkeycmd(); ungetkeycmd();
ret = 1; ret = 1;