diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2017-08-10 17:16:37 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2017-08-10 17:16:37 +0200 |
| commit | e3b67a8198c852bf6c9db3a0a1a20e87a4e1da74 (patch) | |
| tree | 8486633f6232f49ea330ab8e036decb5dc3bbf74 /Src/Zle/complist.c | |
| parent | f8edeff2494bf23e2ee29d4c761361b1c878e09d (diff) | |
| parent | dc475bfa0ec6cd03789dde3bf28f71e0ea9d5003 (diff) | |
| download | zsh-e3b67a8198c852bf6c9db3a0a1a20e87a4e1da74.tar.gz zsh-e3b67a8198c852bf6c9db3a0a1a20e87a4e1da74.zip | |
Merge tag '5.4.1' into debian
Release 5.4.1.
Diffstat (limited to 'Src/Zle/complist.c')
| -rw-r--r-- | Src/Zle/complist.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index 2edaf6eca..a83daeff9 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -1993,7 +1993,8 @@ complistmatches(UNUSED(Hookdef dummy), Chdata dat) if (noselect > 0) noselect = 0; - if ((minfo.asked == 2 && mselect < 0) || nlnct >= zterm_lines) { + if ((minfo.asked == 2 && mselect < 0) || nlnct >= zterm_lines || + errflag) { showinglist = 0; amatches = oamatches; return (noselect = 1); @@ -2333,11 +2334,6 @@ msearch(Cmatch **ptr, char *ins, int back, int rep, int *wrapp) } } if (x == ex && y == ey) { - if (wrap) { - msearchstate = MS_FAILED | owrap; - break; - } - msearchstate |= MS_WRAPPED; if (back) { x = mcols - 1; @@ -2349,6 +2345,13 @@ msearch(Cmatch **ptr, char *ins, int back, int rep, int *wrapp) } ex = mcol; ey = mline; + + if (wrap || (x == ex && y == ey)) { + msearchstate = MS_FAILED | owrap; + break; + } + + msearchstate |= MS_WRAPPED; wrap = 1; *wrapp = 1; } |