From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 2 Oct 2016 21:09:31 +0000 (+0200)
Subject: patch 8.0.0021
X-Git-Tag: v8.0.0021
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84dbd494dca599ecff05b2c2279d402c12e6d197;p=vim

patch 8.0.0021
Problem:    In the GUI when redrawing the cursor it may be on the second half
            of a double byte character.
Solution:   Correct the cursor column. (Yasuhiro Matsumoto)
---

diff --git a/src/screen.c b/src/screen.c
index 4604ec728..5ebca0980 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -765,6 +765,9 @@ update_screen(int type)
 	     * uses that. */
 	    gui.col = gui_cursor_col;
 	    gui.row = gui_cursor_row;
+# ifdef FEAT_MBYTE
+	    gui.col = mb_fix_col(gui.col, gui.row);
+# endif
 	    gui_update_cursor(FALSE, FALSE);
 	    screen_cur_col = gui.col;
 	    screen_cur_row = gui.row;
diff --git a/src/version.c b/src/version.c
index b74ad2f4d..dc8e9cf35 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    21,
 /**/
     20,
 /**/