diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-02-17 02:08:21 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-02-17 02:08:21 +0100 |
| commit | 706b01ba7999b65da68055a7ac75c2be410ffd2c (patch) | |
| tree | 10d60b3bb28151dde32730f34e7dfdd0074e2cbd /src/nvim/option.c | |
| parent | 4a107a11a1c708c2fb8e40b6464f080aca111767 (diff) | |
| parent | 095e6cc2e098db110981e5f9ea4bbc0ce316cecb (diff) | |
| download | rneovim-706b01ba7999b65da68055a7ac75c2be410ffd2c.tar.gz rneovim-706b01ba7999b65da68055a7ac75c2be410ffd2c.tar.bz2 rneovim-706b01ba7999b65da68055a7ac75c2be410ffd2c.zip | |
Merge #6114 'Partial string handling refactoring'.
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index a218323dac..e697ab3f51 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -2569,12 +2569,11 @@ did_set_string_option ( init_highlight(FALSE, FALSE); - if (dark != (*p_bg == 'd') - && get_var_value((char_u *)"g:colors_name") != NULL) { - /* The color scheme must have set 'background' back to another - * value, that's not what we want here. Disable the color - * scheme and set the colors again. */ - do_unlet((char_u *)"g:colors_name", TRUE); + if (dark != (*p_bg == 'd') && get_var_value("g:colors_name") != NULL) { + // The color scheme must have set 'background' back to another + // value, that's not what we want here. Disable the color + // scheme and set the colors again. + do_unlet((char_u *)"g:colors_name", true); free_string_option(p_bg); p_bg = vim_strsave((char_u *)(dark ? "dark" : "light")); check_string_option(&p_bg); @@ -3886,7 +3885,7 @@ set_bool_option ( "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"); msg_source(hl_attr(HLF_W)); - MSG_ATTR(_(w_arabic), hl_attr(HLF_W)); + msg_attr(_(w_arabic), hl_attr(HLF_W)); set_vim_var_string(VV_WARNINGMSG, _(w_arabic), -1); } |