patch 7.4.721

Problem:    When 'list' is set Visual mode does not highlight anything in
            empty lines. (mgaleski)
Solution:   Check the value of lcs_eol in another place. (Christian Brabandt)

diff --git a/src/screen.c b/src/screen.c
index a0e9fc9fb9f1945a3a014b53b032cb31f924629d..e210ec8c9635c48c6b85990128dec1956218613d 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -4703,7 +4703,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
                    }
                }
                else if (c == NUL
-                       && ((wp->w_p_list && lcs_eol > 0)
+                       && (wp->w_p_list
                            || ((fromcol >= 0 || fromcol_prev >= 0)
                                && tocol > vcol
                                && VIsual_mode != Ctrl_V
@@ -4749,7 +4749,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
                            c_extra = NUL;
                        }
                    }
-                   if (wp->w_p_list)
+                   if (wp->w_p_list && lcs_eol > 0)
                        c = lcs_eol;
                    else
                        c = ' ';

diff --git a/src/version.c b/src/version.c
index 8e0edfbd3b4c1809609074b92bb703d494b49df3..1be013492cd366b7d8e0e3e8c3e8729b61cfd150 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    721,
 /**/
     720,
 /**/