diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Doc/Zsh/mod_complist.yo | 3 | ||||
| -rw-r--r-- | Src/Zle/complist.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 7cff1cf67..e006e634d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,15 @@ 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, Src/zsh.h, Src/Modules/newuser.c, Test/A01grammar.ztst: "." returns status 128 on execution failure, 129 on failure to find 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. 2009-07-01 Peter Stephenson <pws@csr.com> @@ -11886,5 +11890,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4723 $ +* $Revision: 1.4724 $ ***************************************************** diff --git a/Doc/Zsh/mod_complist.yo b/Doc/Zsh/mod_complist.yo index 3b8baacad..0599b4738 100644 --- a/Doc/Zsh/mod_complist.yo +++ b/Doc/Zsh/mod_complist.yo @@ -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))( scrolls forward one screenful ) +item(tt(accept-search))( +stop listing but take no other action +) enditem() Every other character stops listing and immediately processes the key diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index 41bc7622c..da7a8ce08 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -974,6 +974,8 @@ asklistscroll(int ml) !strcmp(cmd->nam, "menu-complete") || !strcmp(cmd->nam, "menu-expand-or-complete")) mrestlines = lines - 1; + else if (cmd == Th(z_acceptsearch)) + ret = 1; else { ungetkeycmd(); ret = 1; |