diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Zle/compcore.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 1fd109fa7..3d6dd605a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-07-30 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 22565: Src/compcore.c: Fix bug with menu completion after failed + accept-and-menu-complete, perhaps. + 2006-06-26 Peter Stephenson <pws@csr.com> * 22516: Src/parse.c: error evaluating "func()" didn't pop diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index 084895ae1..0547f9b33 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -454,12 +454,12 @@ before_complete(UNUSED(Hookdef dummy), int *lst) /* If we are doing a menu-completion... */ - if (menucmp && *lst != COMP_LIST_EXPAND && + if (minfo.cur && menucmp && *lst != COMP_LIST_EXPAND && (menucmp != 1 || !compwidget || compwidget == lastcompwidget)) { do_menucmp(*lst); return 1; } - if (menucmp && validlist && *lst == COMP_LIST_COMPLETE) { + if (minfo.cur && menucmp && validlist && *lst == COMP_LIST_COMPLETE) { showinglist = -2; onlyexpl = listdat.valid = 0; return 1; |