updated for version 7.1-329

diff --git a/src/screen.c b/src/screen.c
index 3a585ffa9c290cda82fd3f147fbcddbc91745c8d..7945866f69b810709a8c4fcdb7d79074b79e8e5b 100644 (file)
--- 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 bd4a99f5c12099f315db2ee57f33acc3050fc7df..f9b88868e0e7e4ea3cc7e1204cf2cb7b585ae5ec 100644 (file)
--- 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,
 /**/