diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-08-26 08:25:36 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-08-26 10:14:59 +0800 |
| commit | fa1c761d62667c28e4d3a81f379abeddb878f3cd (patch) | |
| tree | 49b4a1025bed19a5948b7afefe300a4aabd0842e /src/nvim/optionstr.c | |
| parent | 1ba3d5c712dcc2e2ee35c6bc27d9965f671f967a (diff) | |
| download | rneovim-fa1c761d62667c28e4d3a81f379abeddb878f3cd.tar.gz rneovim-fa1c761d62667c28e4d3a81f379abeddb878f3cd.tar.bz2 rneovim-fa1c761d62667c28e4d3a81f379abeddb878f3cd.zip | |
vim-patch:9.0.0036: 'fillchars' cannot have window-local values
Problem: 'fillchars' cannot have window-local values.
Solution: Make 'fillchars' global-local. (closes vim/vim#5206)
https://github.com/vim/vim/commit/96ba25ac01279f73c0ecb5d4aa4ff37aa359e5eb
Cherry-pick g:run_nr from patch 8.2.0454.
N/A patches for version.c:
vim-patch:9.0.0037: build error
Problem: Build error.
Solution: Add missing change.
https://github.com/vim/vim/commit/510f03738dfcadfe2099c5b6a58cb75f64dbaa82
Diffstat (limited to 'src/nvim/optionstr.c')
| -rw-r--r-- | src/nvim/optionstr.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/nvim/optionstr.c b/src/nvim/optionstr.c index e1538e0491..e6847c3ea5 100644 --- a/src/nvim/optionstr.c +++ b/src/nvim/optionstr.c @@ -960,7 +960,9 @@ char *did_set_string_option(int opt_idx, char_u **varp, char_u *oldval, char *er FOR_ALL_TAB_WINDOWS(tp, wp) { // If no error was returned above, we don't expect an error // here, so ignore the return value. - (void)set_chars_option(wp, (char_u **)&wp->w_p_lcs, true); + if (*wp->w_p_lcs == NUL) { + (void)set_chars_option(wp, (char_u **)&wp->w_p_lcs, true); + } } redraw_all_later(UPD_NOT_VALID); } @@ -977,7 +979,9 @@ char *did_set_string_option(int opt_idx, char_u **varp, char_u *oldval, char *er FOR_ALL_TAB_WINDOWS(tp, wp) { // If no error was returned above, we don't expect an error // here, so ignore the return value. - (void)set_chars_option(wp, (char_u **)&wp->w_p_fcs, true); + if (*wp->w_p_fcs == NUL) { + (void)set_chars_option(wp, (char_u **)&wp->w_p_fcs, true); + } } redraw_all_later(UPD_NOT_VALID); } |