From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 21 Jun 2008 12:14:30 +0000 (+0000)
Subject: updated for version 7.1-329
X-Git-Tag: v7.1.329
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88f3d3a267a89d87907d50ac8081445b21b4f778;p=vim

updated for version 7.1-329
---

diff --git a/src/screen.c b/src/screen.c
index 3a585ffa9..7945866f6 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4863,6 +4863,7 @@ comp_char_differs(off_from, off_to)
  * - the (first byte of the) character is different
  * - the attributes are different
  * - the character is multi-byte and the next byte is different
+ * - the character is two cells wide and the second cell differs.
  */
     static int
 char_needs_redraw(off_from, off_to, cols)
@@ -4884,7 +4885,9 @@ char_needs_redraw(off_from, off_to, cols)
 		|| (enc_utf8
 		    && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to]
 			|| (ScreenLinesUC[off_from] != 0
-			    && comp_char_differs(off_from, off_to))))
+			    && comp_char_differs(off_from, off_to))
+			|| (cols > 1 && ScreenLines[off_from + 1]
+						 != ScreenLines[off_to + 1])))
 #endif
 	       ))
 	return TRUE;
diff --git a/src/version.c b/src/version.c
index bd4a99f5c..f9b88868e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    329,
 /**/
     328,
 /**/