mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-11-19 21:44:11 +01:00
Code

fix for interactive mode when menu selection is called via the menu-select widget (17394)

Browse Source
This commit is contained in:
Sven Wischnowsky 2002-07-03 07:59:53 +00:00
parent f5c8907ec5
commit d98faffcaf
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-07-03 Sven Wischnowsky <wischnow@zsh.org>
* 17394: Src/Zle/complist.c: fix for interactive mode when menu
selection is called via the menu-select widget
2002-07-02 Sven Wischnowsky <wischnow@zsh.org>
* 17393: Completion/Unix/Command/_chown,

10
Src/Zle/complist.c
View File

@ -2201,9 +2201,9 @@ domenuselect(Hookdef dummy, Chdata dat)
menucomplete(zlenoargs);
iforcemenu = 0;
if (dat->num < 1 || !minfo.cur || !*(minfo.cur)) {
if ((dat ? dat->num : nmatches) < 1 || !minfo.cur || !*(minfo.cur)) {
nolist = 1;
if (dat->nmesg || nmessages) {
if ((dat ? (dat->nmesg || nmessages) : nmessages)) {
showinglist = -2;
zrefresh();
} else {
@ -2768,13 +2768,13 @@ domenuselect(Hookdef dummy, Chdata dat)
mselect = mlastcols = mlastlines = -1;
mstatus = NULL;
inselect = mhasstat = 0;
if (acc) {
if (acc && validlist && minfo.cur) {
menucmp = lastambig = hasoldlist = 0;
do_single(*(minfo.cur));
}
if (wasnext || broken) {
menucmp = 2;
showinglist = -2;
showinglist = (validlist ? -2 : 0);
minfo.asked = 0;
if (!noselect) {
int nos = noselect;
@ -2784,7 +2784,7 @@ domenuselect(Hookdef dummy, Chdata dat)
}
}
if (!noselect && (!dat || acc)) {
showinglist = -2;
showinglist = (validlist ? -2 : 0);
onlyexpl = oe;
if (!smatches)
clearlist = 1;