diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-11-27 20:58:39 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-11-27 20:58:39 -0500 |
| commit | 49b65b0fcd360f483d93d3b1ed70610bcffd95c4 (patch) | |
| tree | 95bf8900c29f7ee3361d1a0454da4e75a0aaeca7 /src/nvim/screen.c | |
| parent | e5a386d2f819ee3a357384279d1a7810ec213087 (diff) | |
| parent | 9ab44e74abb7553ad39c13621e0904680e61287d (diff) | |
| download | rneovim-49b65b0fcd360f483d93d3b1ed70610bcffd95c4.tar.gz rneovim-49b65b0fcd360f483d93d3b1ed70610bcffd95c4.tar.bz2 rneovim-49b65b0fcd360f483d93d3b1ed70610bcffd95c4.zip | |
Merge pull request #1516 from fmoralesc/new-patches
vim-patch:7.4.425,435,467,472,473,478
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index bb26066526..2dbf3f8888 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -1205,8 +1205,13 @@ static void win_update(win_T *wp) */ if (VIsual_mode == Ctrl_V) { colnr_T fromc, toc; + int save_ve_flags = ve_flags; + + if (curwin->w_p_lbr) + ve_flags = VE_ALL; getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); + ve_flags = save_ve_flags; ++toc; if (curwin->w_curswant == MAXCOL) toc = MAXCOL; @@ -3725,6 +3730,7 @@ win_line ( * special character (via 'listchars' option "precedes:<char>". */ if (lcs_prec_todo != NUL + && wp->w_p_list && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) && filler_todo <= 0 && draw_state > WL_NR |