kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 19:25:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4628 from brcolow/vim-7.4.1101

Browse Source 
vim-patch: 7.4.1101
This commit is contained in:
Justin M. Keyes 2016-05-10 01:19:27 -04:00
commit 9fe0302385
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/screen.c
View File

@ -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. */

2
src/nvim/version.c
View File

@ -577,7 +577,7 @@ static int included_patches[] = {
// 1104 NA
// 1103 NA
// 1102,
// 1101,
1101,
// 1100 NA
// 1099 NA
// 1098 NA