# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1475442904 -7200
# Node ID d54d4a258b96e1aee8053ddad31a3b1f26749dbd
# Parent  f74ccaf7e25644b44ae612fdc04f53bff20b5e28
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Oct 2 23:09:31 2016 +0200

    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
--- 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
--- 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 */
 /**/
+    21,
+/**/
     20,
 /**/
     19,