about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/zle_refresh.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d9788801..034332964 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-17  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* Mikael: 28356: Src/Zle/zle_refresh.c: don't increment old
+	display line past NULL.
+
 	* c.f. 28353: Doc/Zsh/metafaq.yo: removing remaining reference
 	to sunsite in FTP sites.
 
@@ -13760,5 +13763,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5107 $
+* $Revision: 1.5108 $
 *****************************************************
diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c
index e0f142198..33a46a2f3 100644
--- a/Src/Zle/zle_refresh.c
+++ b/Src/Zle/zle_refresh.c
@@ -2089,7 +2089,9 @@ refreshline(int ln)
 	     * We check for WEOF inside.
 	     */
 	    zputc(nl);
-	    nl++, ol++;
+	    nl++;
+	    if (ol->chr)
+	      ol++;
 	    ccs++, vcs++;
 #ifdef MULTIBYTE_SUPPORT
 	    /*