changeset 7603:d3892f6c917e v7.4.1101

commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jan 15 22:52:22 2016 +0100 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)
author Christian Brabandt <cb@256bit.org>
date Fri, 15 Jan 2016 23:00:05 +0100
parents a82b2d79e61b
children 09a1aca8d980
files src/screen.c src/version.c
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/screen.c
+++ b/src/screen.c
@@ -4976,7 +4976,12 @@ win_line(wp, lnum, startrow, endrow, noc
 		&& 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;
 	}
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1101,
+/**/
     1100,
 /**/
     1099,