patch 7.4.1942

Problem:    Background is not drawn properly when 'termguicolors' is set.
Solution:   Check cterm_normal_bg_color. (Jacob Niehus, closes #805)

diff --git a/src/screen.c b/src/screen.c
index f55dba68f43b570a7a5a09140b05b3b9200fab65..684401cd2930983eb10fbc98d3b3ffee35de20cf 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -8967,9 +8967,12 @@ can_clear(char_u *p)
                || gui.in_use
 #endif
 #ifdef FEAT_TERMGUICOLORS
-               || (p_tgc && cterm_normal_bg_gui_color != (long_u)INVALCOLOR)
+               || (p_tgc && cterm_normal_bg_gui_color == (long_u)INVALCOLOR)
+               || (!p_tgc && cterm_normal_bg_color == 0)
+#else
+               || cterm_normal_bg_color == 0
 #endif
-               || cterm_normal_bg_color == 0 || *T_UT != NUL));
+               || *T_UT != NUL));
 }
 
 /*

diff --git a/src/version.c b/src/version.c
index 9dfb18f3823f128de32172311f80ef1e379a24d4..3f41a9e0a7a3b39f6b5d547dbe1d36a9f4841168 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1942,
 /**/
     1941,
 /**/