diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-10 01:19:27 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-10 01:19:27 -0400 |
| commit | 9fe0302385fadd91e5ddd8b0e25d3054ce7afbc4 (patch) | |
| tree | c406414588143db419ddfbc7fe698a13229f705e /src | |
| parent | 31373e400d77a944586e43888f698841148ec7f8 (diff) | |
| parent | de0ea44698b314cb1eaa2d83c9b867681d60efd0 (diff) | |
| download | rneovim-9fe0302385fadd91e5ddd8b0e25d3054ce7afbc4.tar.gz rneovim-9fe0302385fadd91e5ddd8b0e25d3054ce7afbc4.tar.bz2 rneovim-9fe0302385fadd91e5ddd8b0e25d3054ce7afbc4.zip | |
Merge pull request #4628 from brcolow/vim-7.4.1101
vim-patch: 7.4.1101
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 59168b29a0..10b5b6bba4 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -3693,9 +3693,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 637b3778a7..b2dbfe87c8 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -577,7 +577,7 @@ static int included_patches[] = { // 1104 NA // 1103 NA // 1102, - // 1101, + 1101, // 1100 NA // 1099 NA // 1098 NA |