diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 1999-04-27 17:39:42 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-04-27 17:39:42 +0000 |
| commit | cb801a01033e4b00f3181f956194502a53dbcccd (patch) | |
| tree | 564c21466ab26147db34ad9e1dfc2604c93d37e4 | |
| parent | 3e5977cdee151dd00fd6a8fc3af31e5a0745208c (diff) | |
| download | zsh-cb801a01033e4b00f3181f956194502a53dbcccd.tar.gz zsh-cb801a01033e4b00f3181f956194502a53dbcccd.tar.xz zsh-cb801a01033e4b00f3181f956194502a53dbcccd.zip | |
zsh-workers:6124
| -rw-r--r-- | Completion/Core/_oldlist | 2 | ||||
| -rw-r--r-- | Src/Zle/zle_tricky.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Completion/Core/_oldlist b/Completion/Core/_oldlist index 9e791b3a5..f42197695 100644 --- a/Completion/Core/_oldlist +++ b/Completion/Core/_oldlist @@ -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 diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index 88d811a06..591b0a75f 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -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(); |