Merge remote-tracking branch 'vim/master'

Author: splhack

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;

src/version.c

@@ -779,6 +779,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    21,
 /**/
     20,
 /**/