diff --git a/src/screen.c b/src/screen.c
index a0e9fc9fb9..e210ec8c96 100644
--- 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 8e0edfbd3b..1be013492c 100644
--- 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,
 /**/