1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-06-15 20:38:10 +02:00

zsh-workers:6124

This commit is contained in:
Tanaka Akira 1999-04-27 17:39:42 +00:00
parent 3e5977cdee
commit cb801a0103
2 changed files with 4 additions and 3 deletions
Completion/Core
Src/Zle

View file

@ -15,7 +15,7 @@ fi
# If this is a completion widget, and we have a completion inserted already,
# and the compconfig key oldlist_menu is not never, then we cycle through the
# existing list (even if it was generated by another widget).
if [[ -n $compstate[old_insert] && $WIDGET = *complete(|-prefix) &&
if [[ -n $compstate[old_insert] && $WIDGET = *complete(|-prefix|-word) &&
$compconfig[oldlist_menu] != never ]]; then
compstate[old_list]=keep
if [[ $WIDGET = *reverse* ]]; then

View file

@ -760,8 +760,8 @@ docomplete(int lst)
/* If we are doing a menu-completion... */
if (menucmp && lst != COMP_LIST_EXPAND && compwidget &&
compwidget == lastcompwidget) {
if (menucmp && lst != COMP_LIST_EXPAND &&
(!compwidget || compwidget == lastcompwidget)) {
do_menucmp(lst);
return;
}
@ -4598,6 +4598,7 @@ makecomplist(char *s, int incmd, int lst)
insmnum = insgnum = 1;
insgroup = oldlist = oldins = 0;
begcmgroup("default", 0);
menucmp = 0;
ccused = newlinklist();
ccstack = newlinklist();