diff options
| author | Michael Ennen <mike.ennen@gmail.com> | 2016-04-21 12:50:33 -0700 |
|---|---|---|
| committer | Michael Ennen <mike.ennen@gmail.com> | 2016-04-26 23:43:42 -0700 |
| commit | de0ea44698b314cb1eaa2d83c9b867681d60efd0 (patch) | |
| tree | 403f2070a58fc6b35f21e1d5b74b2ce760a6c571 /src | |
| parent | cef624ee9e14bf15598219d96f65a6e4932eb935 (diff) | |
| download | rneovim-de0ea44698b314cb1eaa2d83c9b867681d60efd0.tar.gz rneovim-de0ea44698b314cb1eaa2d83c9b867681d60efd0.tar.bz2 rneovim-de0ea44698b314cb1eaa2d83c9b867681d60efd0.zip | |
vim-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)
https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/screen.c | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 1cc270023c..d650d56bc0 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -3700,9 +3700,13 @@ win_line ( && wp == curwin && lnum == wp->w_cursor.lnum && conceal_cursor_line(wp) && (int)wp->w_virtcol <= vcol + n_skip) { - wp->w_wcol = col - boguscols; + if (wp->w_p_rl) { + wp->w_wcol = wp->w_width - col + boguscols - 1; + } else { + wp->w_wcol = col - boguscols; + } wp->w_wrow = row; - did_wcol = TRUE; + did_wcol = true; } /* Don't override visual selection highlighting. */ diff --git a/src/nvim/version.c b/src/nvim/version.c index 5ead7cecbe..d7051647dd 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -264,7 +264,7 @@ static int included_patches[] = { // 1104 NA // 1103 NA // 1102, - // 1101, + 1101, // 1100 NA // 1099 NA // 1098 NA |