diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2006-07-30 19:58:31 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2006-07-30 19:58:31 +0000 |
| commit | f5bbc619bd76fe871ecd241ca3a2d698fa509398 (patch) | |
| tree | 3ea2f689f30743688a72e32e80874eede12141a5 | |
| parent | 663b9376ad64be2523cc22b9ec818defac53f0d9 (diff) | |
| download | zsh-f5bbc619bd76fe871ecd241ca3a2d698fa509398.tar.gz zsh-f5bbc619bd76fe871ecd241ca3a2d698fa509398.tar.xz zsh-f5bbc619bd76fe871ecd241ca3a2d698fa509398.zip | |
22565: Fix bug after failed menucompletion with accept-and-menu-complete?
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/Zle/compcore.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 65d6bfc52..94ff508ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +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. + * 22562: Src/glob.c, Test/D07multibyte.ztst: make ${...#...} etc. understand multibyte characters. diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index 38b1934e2..8aa44d319 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -466,12 +466,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; |