Mercurial > vim
changeset 34069:170e917524f7 v9.1.0004
patch 9.1.0004: reloading colorscheme when not changing 'background'
Commit: https://github.com/vim/vim/commit/83ad2726ff56db70cb2da78e1e4ea0e09941c73b
Author: Gregory Anders <greg@gpanders.com>
Date: Wed Jan 3 19:48:51 2024 +0100
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 03 Jan 2024 20:00:06 +0100 |
| parents | f7816a6f68ed |
| children | bac2ce371abc |
| files | runtime/doc/options.txt src/optionstr.c src/version.c |
| diffstat | 3 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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 shor 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.
--- a/src/optionstr.c +++ b/src/optionstr.c @@ -1050,11 +1050,15 @@ expand_set_ambiwidth(optexpand_T *args, * 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