# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1485981004 -3600
# Node ID e7b8be5ecacd054ff52428115062809ad125f307
# Parent  6976b8224589d5e0cb687141de515464bd31d14f
patch 8.0.0290: cursor positioning wrong if wide character wraps

commit https://github.com/vim/vim/commit/04e87b72c5fa88b7034a5b0ec0be6a7ad763e9d2
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Feb 1 21:23:10 2017 +0100

    patch 8.0.0290: cursor positioning wrong if wide character wraps

    Problem:    If a wide character doesn't fit at the end of the screen line, and
                the line doesn't fit on the screen, then the cursor position may
                be wrong. (anliting)
    Solution:   Don't skip over wide character. (Christian Brabandt, closes #1408)

diff --git a/src/screen.c b/src/screen.c
--- a/src/screen.c
+++ b/src/screen.c
@@ -2903,7 +2903,7 @@ win_line(
     int		endrow,
     int		nochange UNUSED)	/* not updating for changed text */
 {
-    int		col;			/* visual column on screen */
+    int		col = 0;		/* visual column on screen */
     unsigned	off;			/* offset in ScreenLines/ScreenAttrs */
     int		c = 0;			/* init for GCC */
     long	vcol = 0;		/* virtual column (for tabs) */
@@ -3429,7 +3429,11 @@ win_line(
 #else
 	    --ptr;
 #endif
-	    n_skip = v - vcol;
+#ifdef FEAT_MBYTE
+           /* character fits on the screen, don't need to skip it */
+           if ((*mb_ptr2cells)(ptr) >= c && col == 0)
+#endif
+	       n_skip = v - vcol;
 	}
 
 	/*
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    290,
+/**/
     289,
 /**/
     288,