diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2010-08-13 08:52:06 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2010-08-13 08:52:06 +0000 |
| commit | 8e5061d0c63f1e0b3c71b212fdc380ba0a347a58 (patch) | |
| tree | ea4616b97816723a713e0f910aa5656a574eb32a | |
| parent | 80eee3a4a336a0a91d73be5cd752d5f788661d4b (diff) | |
| download | zsh-8e5061d0c63f1e0b3c71b212fdc380ba0a347a58.tar.gz zsh-8e5061d0c63f1e0b3c71b212fdc380ba0a347a58.zip | |
28160, 28164: fix redisplay problem after display reset
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Src/Zle/zle_refresh.c | 7 |
2 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2010-08-13 Peter Stephenson <pws@csr.com> + + * 28160 modified as per 28164: Src/Zle/zle_refresh.c: when the + display was reset we didn't properly mark the old display line + as invalid. This could mean the display didn't get redrawn + properly. + 2010-08-11 Peter Stephenson <pws@csr.com> * 28139: based on Frank Terbeck: 28122: Src/Zle/zle_params.c, @@ -13518,5 +13525,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5055 $ +* $Revision: 1.5056 $ ***************************************************** diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c index f03e7dc63..e0f142198 100644 --- a/Src/Zle/zle_refresh.c +++ b/Src/Zle/zle_refresh.c @@ -1789,7 +1789,7 @@ refreshline(int ln) /* 0: setup */ nl = nbuf[ln]; rnllen = nllen = nl ? ZR_strlen(nl) : 0; - if (obuf[ln]) { + if (ln < olnct && obuf[ln]) { ol = obuf[ln]; ollen = ZR_strlen(ol); } @@ -2083,6 +2083,11 @@ refreshline(int ln) if (now_off) settextattributes(TXT_ATTR_OFF_FROM_ON(now_off)); + /* + * This is deliberately called if nl->chr is WEOF + * in order to keep text attributes consistent. + * We check for WEOF inside. + */ zputc(nl); nl++, ol++; ccs++, vcs++; |