summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-06-21 12:14:30 +0000
committerBram Moolenaar <Bram@vim.org>2008-06-21 12:14:30 +0000
commit88f3d3a267a89d87907d50ac8081445b21b4f778 (patch)
tree01f78e084ba7f2da835cf2fcdfed0ccf093d87f8
parentbf820723f58c7c788531e2a310d6b57bd2263236 (diff)
updated for version 7.1-329v7.1.329
-rw-r--r--src/screen.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index 3a585ffa9c..7945866f69 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 bd4a99f5c1..f9b88868e0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 329,
+/**/
328,
/**/
327,