patch 7.4.1101

Problem:    With 'rightleft' and concealing the cursor may move to the wrong
            position.
Solution:   Compute the column differently when 'rightleft' is set. (Hirohito
            Higashi)

diff --git a/src/screen.c b/src/screen.c
index 5610d8a9637b5737e40a3fc196c1f58b28d16d57..d34c4b2f208f801eb7dbb8b77440ea988d5f4977 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -4976,7 +4976,12 @@ win_line(wp, lnum, startrow, endrow, nochange)
                && conceal_cursor_line(wp)
                && (int)wp->w_virtcol <= vcol + n_skip)
        {
-           wp->w_wcol = col - boguscols;
+#  ifdef FEAT_RIGHTLEFT
+           if (wp->w_p_rl)
+               wp->w_wcol = W_WIDTH(wp) - col + boguscols - 1;
+           else
+#  endif
+               wp->w_wcol = col - boguscols;
            wp->w_wrow = row;
            did_wcol = TRUE;
        }

diff --git a/src/version.c b/src/version.c
index 5fdc45733b2922b3cd9757a7242c83fe6d45dbd1..1abb93e0f9f178f58311196a07eaaa892bbe1770 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1101,
 /**/
     1100,
 /**/