patch 8.0.0616: not always setting 'background' correctly after :hi Normal

Problem:    When setting the cterm background with ":hi Normal" the value of
            'background' may be set wrongly.
Solution:   Check that the color is less than 16.  Don't set 'background' when
            it was set explicitly. (Lemonboy, closes #1710)

diff --git a/src/syntax.c b/src/syntax.c
index 42a0bdc3f956be5396f88892408fbfd8b477f9ac..10805f4e821d6e3fad791dc8ca7fc1581b3a83c4 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -7834,18 +7834,25 @@ do_highlight(
                        must_redraw = CLEAR;
                        if (color >= 0)
                        {
+                           int dark = -1;
+
                            if (termcap_active)
                                term_bg_color(color);
                            if (t_colors < 16)
-                               i = (color == 0 || color == 4);
-                           else
-                               i = (color < 7 || color == 8);
+                               dark = (color == 0 || color == 4);
+                           /* Limit the heuristic to the standard 16 colors */
+                           else if (color < 16)
+                               dark = (color < 7 || color == 8);
                            /* Set the 'background' option if the value is
                             * wrong. */
-                           if (i != (*p_bg == 'd'))
+                           if (dark != -1
+                                   && dark != (*p_bg == 'd')
+                                   && !option_was_set((char_u *)"bg"))
+                           {
                                set_option_value((char_u *)"bg", 0L,
-                                       i ?  (char_u *)"dark"
-                                         : (char_u *)"light", 0);
+                                      (char_u *)(dark ? "dark" : "light"), 0);
+                               reset_option_was_set((char_u *)"bg");
+                           }
                        }
                    }
                }

diff --git a/src/testdir/test_syntax.vim b/src/testdir/test_syntax.vim
index 8d4be00d38d2fa0564d83002a1818e9503dc8b4b..eb093c8ff344f21d06685ac658b6cb190a701f5c 100644 (file)
--- a/src/testdir/test_syntax.vim
+++ b/src/testdir/test_syntax.vim
@@ -401,3 +401,26 @@ func Test_highlight_invalid_arg()
   call assert_fails('hi XXX xxx=White', 'E423:')
 endfunc
 
+func Test_bg_detection()
+  if has('gui_running')
+    return
+  endif
+  " auto-detection of &bg, make sure sure it isn't set anywhere before
+  " this test
+  hi Normal ctermbg=0
+  call assert_equal('dark', &bg)
+  hi Normal ctermbg=4
+  call assert_equal('dark', &bg)
+  hi Normal ctermbg=12
+  call assert_equal('light', &bg)
+  hi Normal ctermbg=15
+  call assert_equal('light', &bg)
+
+  " manually-set &bg takes precendence over auto-detection
+  set bg=light
+  hi Normal ctermbg=4
+  call assert_equal('light', &bg)
+  set bg=dark
+  hi Normal ctermbg=12
+  call assert_equal('dark', &bg)
+endfunc

diff --git a/src/version.c b/src/version.c
index c0711fb84d7b199513bd84649ee546c09b9faad2..eb46948597925ab47de06fb402f8d5d1525520e0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    616,
 /**/
     615,
 /**/