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

26393: turn off text attributes in refresh when deleting text

Browse source
This commit is contained in:
Peter Stephenson 2009-01-13 16:05:46 +00:00
parent 0cf040f4bf
commit 7e5d340abe
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,8 @@
2009-01-13 Peter Stephenson <pws@csr.com> 2009-01-13 Peter Stephenson <pws@csr.com>
* 26393: Src/Zle/zle_refresh.c: turn off text attributes when
deleting text, to avoid them being used for inserted blanks.
* unposted: Completion/Base/Utility/_values, Doc/Zsh/compwid.yo, * unposted: Completion/Base/Utility/_values, Doc/Zsh/compwid.yo,
Src/Zle/compcore.c, Src/Zle/complete.c, Src/Zle/compresult.c: Src/Zle/compcore.c, Src/Zle/complete.c, Src/Zle/compresult.c:
Back off 26270 and follow up; was causing memory corruption. Back off 26270 and follow up; was causing memory corruption.
@ -10901,5 +10904,5 @@
***************************************************** *****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL * This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.4506 $ * $Revision: 1.4507 $
***************************************************** *****************************************************

19
Src/Zle/zle_refresh.c
View file

@ -1973,8 +1973,18 @@ refreshline(int ln)
eg. oldline: hifoobar \ hopefully cheaper here to delete two eg. oldline: hifoobar \ hopefully cheaper here to delete two
newline: foobar / characters, then we have six matches */ newline: foobar / characters, then we have six matches */
if (tccan(TCDEL)) { if (tccan(TCDEL)) {
int first = 1;
for (i = 1; ol[i].chr; i++) for (i = 1; ol[i].chr; i++)
if (tcdelcost(i) < wpfxlen(ol + i, nl)) { if (tcdelcost(i) < wpfxlen(ol + i, nl)) {
/*
* Some terminals will output the current
* attributes into cells added at the end by
* deletions, so turn off text attributes.
*/
if (first) {
clearattributes();
first = 0;
}
tc_delchars(i); tc_delchars(i);
ol += i; ol += i;
char_ins -= i; char_ins -= i;
@ -1984,15 +1994,6 @@ refreshline(int ln)
char_ins--; char_ins--;
} }
#endif #endif
/*
* If the sequence we're deleting ended
* by turning off an attribute, make sure
* it stays turned off. I don't think we
* should need this.
*/
if (ol[-1].atr & TXT_ATTR_OFF_MASK)
settextattributes(ol[-1].atr &
TXT_ATTR_OFF_MASK);
i = 0; i = 0;
break; break;
} }