From 87e290b4a3ea85ab29b5a3d7292b61cb754a9501 Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Tue, 2 Nov 1999 13:58:40 +0000 Subject: zsh-workers/8490 --- Src/Zle/compcore.c | 2 +- Src/Zle/compresult.c | 9 +++++---- Src/Zle/computil.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'Src/Zle') diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index 353084fd6..ceee468b0 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -334,7 +334,7 @@ do_completion(Hookdef dummy, Compldat dat) while (1) { if (!first) - acceptlast(); + accept_last(); first = 0; if (!--nm) diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c index fe997b12b..70be906db 100644 --- a/Src/Zle/compresult.c +++ b/Src/Zle/compresult.c @@ -1042,7 +1042,7 @@ do_ambig_menu(void) } else { if (oldlist) { if (oldins && minfo.cur) - acceptlast(); + accept_last(); } else minfo.cur = NULL; } @@ -1798,10 +1798,11 @@ printlist(int over, CLPrintFunc printm) q = skipnolist(q + 1); mc++; } - while (i-- > 0) - printm(g, NULL, mc++, ml, (!i), + while (i-- > 0) { + printm(g, NULL, mc, ml, (!i), (g->widths ? g->widths[mc] : g->width), NULL, NULL); - + mc++; + } if (n) { putc('\n', shout); ml++; diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c index 2b1409fb3..0f8188762 100644 --- a/Src/Zle/computil.c +++ b/Src/Zle/computil.c @@ -1035,7 +1035,7 @@ ca_parse_line(Cadef d) state.optbeg = state.argbeg = state.inopt = cur; state.singles = (!pe || !*pe); - for (p = line + 1; p <= pe; p++) { + for (p = line + 1; p < pe; p++) { if ((tmpopt = d->single[STOUC(*p)])) { PERMALLOC { state.oargs[tmpopt->num] = newlinklist(); -- cgit 1.4.1