Merge pull request #4012 from jbradaric/vim-7.4.729

vim-patch:7.4.729
This commit is contained in:
Justin M. Keyes
2016-01-21 02:35:15 -05:00
3 changed files with 7 additions and 6 deletions

View File

@@ -3489,11 +3489,11 @@ win_line (
&& !(noinvcur
&& lnum == wp->w_cursor.lnum
&& (colnr_T)vcol == wp->w_virtcol)))
&& lcs_eol_one >= 0) {
/* Display a '$' after the line or highlight an extra
* character if the line break is included. */
/* For a diff line the highlighting continues after the
* "$". */
&& lcs_eol_one > 0) {
// Display a '$' after the line or highlight an extra
// character if the line break is included.
// For a diff line the highlighting continues after the
// "$".
if (diff_hlf == (hlf_T)0 && line_attr == 0) {
/* In virtualedit, visual selections may extend
* beyond end of line. */