summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-08-23 18:58:14 +0200
committerBram Moolenaar <Bram@vim.org>2012-08-23 18:58:14 +0200
commit451cf63751673e5cc7ecfbd112325217d9a955b5 (patch)
treea7975273a46bb34e29f404c26192dc0dbb8b89cf
parent00b8ae0d3d90f80fc817857dca26359b175b18ed (diff)
updated for version 7.3.638v7.3.638
-rw-r--r--src/screen.c5
-rw-r--r--src/version.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/screen.c b/src/screen.c
index c9f447c9ca..92eb232ef0 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -5332,8 +5332,9 @@ char_needs_redraw(off_from, off_to, cols)
&& (ScreenLinesUC[off_from] != ScreenLinesUC[off_to]
|| (ScreenLinesUC[off_from] != 0
&& comp_char_differs(off_from, off_to))
- || (cols > 1 && ScreenLines[off_from + 1]
- != ScreenLines[off_to + 1])))
+ || ((*mb_off2cells)(off_from, off_from + cols) > 1
+ && ScreenLines[off_from + 1]
+ != ScreenLines[off_to + 1])))
#endif
))
return TRUE;
diff --git a/src/version.c b/src/version.c
index b22c901070..4598c74a00 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,10 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 638,
+/**/
+ 638,
+/**/
637,
/**/
636,