summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-06-17 13:18:49 +0200
committerBram Moolenaar <Bram@vim.org>2016-06-17 13:18:49 +0200
commitd18f672fc9477f3c0cb7cc4ce8d9237ed825c612 (patch)
tree8f61eb789e56825c9a2a31dadc8132888ba8e4ee
parenta02a551e18209423584fcb923e93c6be18f3aa45 (diff)
patch 7.4.1942v7.4.1942
Problem: Background is not drawn properly when 'termguicolors' is set. Solution: Check cterm_normal_bg_color. (Jacob Niehus, closes #805)
-rw-r--r--src/screen.c7
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/screen.c b/src/screen.c
index f55dba68f4..684401cd29 100644
--- 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 9dfb18f382..3f41a9e0a7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1942,
+/**/
1941,
/**/
1940,