mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-10 12:40:58 +02:00
Code Releases Activity

better fix for menu selection on dumb terminal (11885?)

Browse source
This commit is contained in:
Sven Wischnowsky 2000-06-14 06:54:44 +00:00
parent f4c3c3743d
commit 53f5cc9465
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2000-06-14 Sven Wischnowsky <wischnow@zsh.org>
* 11885: Src/Zle/complist.c: better fix for menu selection on dumb
terminal
2000-06-13 Clint Adams <schizo@debian.org> 2000-06-13 Clint Adams <schizo@debian.org>
* 11882: Completion/Debian/_dpkg: more intelligence in * 11882: Completion/Debian/_dpkg: more intelligence in

6
Src/Zle/complist.c
View file

@ -1493,6 +1493,8 @@ complistmatches(Hookdef dummy, Chdata dat)
amatches = dat->matches; amatches = dat->matches;
noselect = 0;
if ((minfo.asked == 2 && mselect < 0) || nlnct >= lines) { if ((minfo.asked == 2 && mselect < 0) || nlnct >= lines) {
showinglist = 0; showinglist = 0;
amatches = oamatches; amatches = oamatches;
@ -1629,8 +1631,6 @@ domenuselect(Hookdef dummy, Chdata dat)
int space, lbeg = 0, step = 1, wrap, pl = nlnct, broken = 0, first = 1; int space, lbeg = 0, step = 1, wrap, pl = nlnct, broken = 0, first = 1;
char *s; char *s;
if (!mtab)
return 0;
if (fdat || (dummy && (!(s = getsparam("MENUSELECT")) || if (fdat || (dummy && (!(s = getsparam("MENUSELECT")) ||
(dat && dat->num < atoi(s))))) { (dat && dat->num < atoi(s))))) {
if (fdat) { if (fdat) {
@ -1651,7 +1651,7 @@ domenuselect(Hookdef dummy, Chdata dat)
mhasstat = (mstatus && *mstatus); mhasstat = (mstatus && *mstatus);
fdat = dat; fdat = dat;
selectlocalmap(mskeymap); selectlocalmap(mskeymap);
noselect = 0; noselect = 1;
while ((menuacc && while ((menuacc &&
!hasbrpsfx(*(minfo.cur), minfo.prebr, minfo.postbr)) || !hasbrpsfx(*(minfo.cur), minfo.prebr, minfo.postbr)) ||
(((*minfo.cur)->flags & (CMF_NOLIST | CMF_MULT)) && (((*minfo.cur)->flags & (CMF_NOLIST | CMF_MULT)) &&