From e39b3d9fb4e4006684c33847d1ef6a0d742699dd Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 15 Jan 2016 22:52:22 +0100
Subject: [PATCH] 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)

---
 src/screen.c  | 7 ++++++-
 src/version.c | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/screen.c b/src/screen.c
index 5610d8a963..d34c4b2f20 100644
--- 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 5fdc45733b..1abb93e0f9 100644
--- 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,
 /**/