patch 9.1.0004: reloading colorscheme when not changing 'background'

Problem:  reloading colorscheme when not changing 'background'
Solution: Check, if the background option value actually changed,
          if not, return early.

Only reload colorscheme when bg is changed

Currently the highlight groups are re-initialized and the colorscheme
(if any) is reloaded anytime 'background' is set, even if it is not
changed. This is unnecessary, because if the value was not changed then
there is no need to change highlight groups or do anything with the
colorscheme. Instead, only reload the colorscheme if the value of
'background' was actually changed.

closes: #13700

Signed-off-by: Gregory Anders <greg@gpanders.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index e6c20220b582eeb803d29f86f121524f2f6aacd7..4dff6b53f3030b619ebd24248d9579fa785b8e8f 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*  For Vim version 9.1.  Last change: 2023 Dec 20
+*options.txt*  For Vim version 9.1.  Last change: 2024 Jan 03
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -997,11 +997,11 @@ A jump table for the options with a short description can be found at |Q_op|.
        what the background color looks like.  For changing the background
        color, see |:hi-normal|.
 
-       When 'background' is set Vim will adjust the default color groups for
-       the new value.  But the colors used for syntax highlighting will not
-       change.                                 *g:colors_name*
+       When 'background' is changed Vim will adjust the default color groups
+       for the new value.  But the colors used for syntax highlighting will
+       not change.                                     *g:colors_name*
        When a color scheme is loaded (the "g:colors_name" variable is set)
-       setting 'background' will cause the color scheme to be reloaded.  If
+       changing 'background' will cause the color scheme to be reloaded.  If
        the color scheme adjusts to the value of 'background' this will work.
        However, if the color scheme sets 'background' itself the effect may
        be undone.  First delete the "g:colors_name" variable when needed.

diff --git a/src/optionstr.c b/src/optionstr.c
index 326e625526ae7004e10377f340ee2a030d0b2836..65a80afe1a680f6682c3ad90a13e374b6d1282f1 100644 (file)
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -1050,11 +1050,15 @@ expand_set_ambiwidth(optexpand_T *args, int *numMatches, char_u ***matches)
  * The 'background' option is changed.
  */
     char *
-did_set_background(optset_T *args UNUSED)
+did_set_background(optset_T *args)
 {
     if (check_opt_strings(p_bg, p_bg_values, FALSE) == FAIL)
        return e_invalid_argument;
 
+    if (args->os_oldval.string != NULL && args->os_oldval.string[0] == *p_bg)
+       // Value was not changed
+       return NULL;
+
 #ifdef FEAT_EVAL
     int dark = (*p_bg == 'd');
 #endif

diff --git a/src/version.c b/src/version.c
index 749d6af13a3f88d3935ae7aa1ba72cf617992aa0..e83654fd56e82046f5ff760020948715fa0eabf3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4,
 /**/
     3,
 /**/