diff options
| author | Oliver Kiddle <opk@zsh.org> | 2023-02-09 00:10:19 +0100 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2023-02-09 00:10:19 +0100 |
| commit | 6502d05897a7d9441fcabfd24f203cffe4da59aa (patch) | |
| tree | 2d22e60ca6103d359476f61abd092699ff633831 /Src/Zle | |
| parent | d6b027c3c1203da5f3c6451bd6e2e0b81bd766b6 (diff) | |
| download | zsh-6502d05897a7d9441fcabfd24f203cffe4da59aa.tar.gz zsh-6502d05897a7d9441fcabfd24f203cffe4da59aa.tar.xz zsh-6502d05897a7d9441fcabfd24f203cffe4da59aa.zip | |
51320, 51383: fixes to prevent later reappearance of old attributes
Also associated test updates and a test fix for TERM=dumb.
Diffstat (limited to 'Src/Zle')
| -rw-r--r-- | Src/Zle/complist.c | 2 | ||||
| -rw-r--r-- | Src/Zle/zle_main.c | 2 | ||||
| -rw-r--r-- | Src/Zle/zle_tricky.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index 8bdf1bb29..9cb89a60d 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -1305,6 +1305,8 @@ compprintfmt(char *fmt, int n, int dopr, int doesc, int ml, int *stop) } } if (dopr) { + treplaceattrs(0); + applytextattributes(0); if (!(cc % zterm_columns)) fputs(" \010", shout); cleareol(); diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c index cfa0a739d..4a6c02133 100644 --- a/Src/Zle/zle_main.c +++ b/Src/Zle/zle_main.c @@ -2071,9 +2071,9 @@ trashzle(void) trashedzle = 1; zrefresh(); showinglist = sl; - moveto(nlnct, 0); treplaceattrs(prompt_attr); applytextattributes(0); + moveto(nlnct, 0); if (clearflag && tccan(TCCLEAREOD)) { tcout(TCCLEAREOD); clearflag = listshown = 0; diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index f94bfce3c..07fac7144 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -2560,6 +2560,8 @@ printfmt(char *fmt, int n, int dopr, int doesc) } } if (dopr) { + treplaceattrs(0); + applytextattributes(0); if (!(cc % zterm_columns)) fputs(" \010", shout); if (tccan(TCCLEAREOL)) |