diff options
Diffstat (limited to 'Src/Zle')
-rw-r--r-- | Src/Zle/compcore.c | 1 | ||||
-rw-r--r-- | Src/Zle/compresult.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index fa8104169..06e7afbfb 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -2932,4 +2932,5 @@ freematches(Cmgroup g) g = n; } + minfo.cur = NULL; } diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c index 7b2707681..f30d8259a 100644 --- a/Src/Zle/compresult.c +++ b/Src/Zle/compresult.c @@ -1495,7 +1495,7 @@ calclist(int showall) ws[tcol++] = maxlen; width += maxlen; } - if (!count && width < columns && + if (!count && width <= columns && (tcols <= 0 || beg == end)) break; @@ -1536,7 +1536,7 @@ calclist(int showall) ws[tcols++] = maxlen; width += maxlen; } - if (nth == yl && width < columns && + if (nth == yl && width <= columns && (beg == end || tlines >= g->lins)) break; @@ -1593,7 +1593,7 @@ calclist(int showall) ws[tcol++] = maxlen; width += maxlen; } - if (!count && width < columns && + if (!count && width <= columns && (tcols <= 0 || beg == end)) break; @@ -1642,7 +1642,7 @@ calclist(int showall) ws[tcols++] = maxlen; width += maxlen; } - if (nth == g->dcount && width < columns && + if (nth == g->dcount && width <= columns && (beg == end || tlines >= g->lins)) break; |