about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2010-08-13 08:52:06 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2010-08-13 08:52:06 +0000
commit8e5061d0c63f1e0b3c71b212fdc380ba0a347a58 (patch)
treeea4616b97816723a713e0f910aa5656a574eb32a /Src
parent80eee3a4a336a0a91d73be5cd752d5f788661d4b (diff)
downloadzsh-8e5061d0c63f1e0b3c71b212fdc380ba0a347a58.tar.gz
zsh-8e5061d0c63f1e0b3c71b212fdc380ba0a347a58.tar.xz
zsh-8e5061d0c63f1e0b3c71b212fdc380ba0a347a58.zip
28160, 28164: fix redisplay problem after display reset
Diffstat (limited to 'Src')
-rw-r--r--Src/Zle/zle_refresh.c7
1 files changed, 6 insertions, 1 deletions
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++;