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

51290: fix display of control characters with SINGLE_LINE_ZLE set

Browse source
This commit is contained in:
Oliver Kiddle 2023-01-10 21:09:54 +01:00
parent cc672f1c3b
commit 498b771a82
2 changed files with 6 additions and 3 deletions

3
ChangeLog
View file

@ -1,5 +1,8 @@
2023-01-10 Oliver Kiddle <opk@zsh.org> 2023-01-10 Oliver Kiddle <opk@zsh.org>
* 51290: Src/Zle/zle_refresh.c: fix display of control
characters with SINGLE_LINE_ZLE set
* 51289: Src/Zle/zle_refresh.c, Src/prompt.c: don't disable * 51289: Src/Zle/zle_refresh.c, Src/prompt.c: don't disable
non-colour attributes in prompts for SINGLE_LINE_ZLE and remove non-colour attributes in prompts for SINGLE_LINE_ZLE and remove
superfluous extra escapes to disable attributes superfluous extra escapes to disable attributes

6
Src/Zle/zle_refresh.c
View file

@ -2419,6 +2419,8 @@ singlerefresh(ZLE_STRING_T tmpline, int tmpll, int tmpcs)
} }
all_attr = mixattrs(special_attr, base_attr); all_attr = mixattrs(special_attr, base_attr);
if (t0 == tmpcs)
nvcs = vp - vbuf;
if (tmpline[t0] == ZWC('\t')) { if (tmpline[t0] == ZWC('\t')) {
for (*vp++ = zr_sp; (vp - vbuf) & 7; ) for (*vp++ = zr_sp; (vp - vbuf) & 7; )
*vp++ = zr_sp; *vp++ = zr_sp;
@ -2461,7 +2463,7 @@ singlerefresh(ZLE_STRING_T tmpline, int tmpll, int tmpcs)
&& (unsigned)tmpline[t0] <= 0xffU && (unsigned)tmpline[t0] <= 0xffU
#endif #endif
) { ) {
ZLE_INT_T t = tmpline[++t0]; ZLE_INT_T t = tmpline[t0];
vp->chr = ZWC('^'); vp->chr = ZWC('^');
vp->atr = all_attr; vp->atr = all_attr;
@ -2498,8 +2500,6 @@ singlerefresh(ZLE_STRING_T tmpline, int tmpll, int tmpcs)
vp++; vp++;
} }
#endif #endif
if (t0 == tmpcs)
nvcs = vp - vbuf - 1;
} }
if (t0 == tmpcs) if (t0 == tmpcs)
nvcs = vp - vbuf; nvcs = vp - vbuf;