From 8e5061d0c63f1e0b3c71b212fdc380ba0a347a58 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Fri, 13 Aug 2010 08:52:06 +0000 Subject: 28160, 28164: fix redisplay problem after display reset --- ChangeLog | 9 ++++++++- Src/Zle/zle_refresh.c | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b16698d5b..20327e31e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-08-13 Peter Stephenson + + * 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 * 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++; -- cgit 1.4.1