updated for version 7.1-259

diff --git a/src/screen.c b/src/screen.c
index 219b664318dbf91b0a5de7568b8384c9ed0788eb..a739927254d086c856220808795960de720e5a6d 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -8045,9 +8045,13 @@ setcursor()
        windgoto(W_WINROW(curwin) + curwin->w_wrow,
                W_WINCOL(curwin) + (
 #ifdef FEAT_RIGHTLEFT
+               /* With 'rightleft' set and the cursor on a double-wide
+                * character, position it on the leftmost column. */
                curwin->w_p_rl ? ((int)W_WIDTH(curwin) - curwin->w_wcol - (
 # ifdef FEAT_MBYTE
-                       has_mbyte ? (*mb_ptr2cells)(ml_get_cursor()) :
+                       (has_mbyte
+                          && (*mb_ptr2cells)(ml_get_cursor()) == 2
+                          && vim_isprintc(gchar_cursor())) ? 2 :
 # endif
                        1)) :
 #endif

diff --git a/src/version.c b/src/version.c
index 21701b794c36a1c7d42da88fc5fc31ff41b87d39..459c90e5fc352ddb3d9cc7b776df0feab4ed619c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    259,
 /**/
     258,
 /**/