diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-02-14 08:29:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-14 08:29:05 +0800 |
| commit | 20c9f4b3521fa7ab5c5997c0ec1a3df2b5bd0dbe (patch) | |
| tree | 092e42d145c081172935e256f5fef7b429c3dfc2 /src/nvim/option.c | |
| parent | fc9ece617bbf5fbdc74eed33c63641c550b4b314 (diff) | |
| download | rneovim-20c9f4b3521fa7ab5c5997c0ec1a3df2b5bd0dbe.tar.gz rneovim-20c9f4b3521fa7ab5c5997c0ec1a3df2b5bd0dbe.tar.bz2 rneovim-20c9f4b3521fa7ab5c5997c0ec1a3df2b5bd0dbe.zip | |
vim-patch:9.0.1307: setting 'formatoptions' with :let doesn't check for errors (#22252)
Problem: Setting 'formatoptions' with :let doesn't check for errors.
Solution: Pass "errbuf" to set_string_option(). (Yegappan Lakshmanan,
closes vim/vim#11974, closes vim/vim#11972)
https://github.com/vim/vim/commit/32ff96ef018eb1a5bea0953648b4892a6ee71658
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 26466c2869..5ece5e4e5d 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -3084,6 +3084,8 @@ char *set_option_value(const char *const name, const long number, const char *co const int opt_flags) FUNC_ATTR_NONNULL_ARG(1) { + static char errbuf[80]; + if (is_tty_option(name)) { return NULL; // Fail silently; many old vimrcs set t_xx options. } @@ -3106,7 +3108,7 @@ char *set_option_value(const char *const name, const long number, const char *co if (s == NULL || opt_flags & OPT_CLEAR) { s = ""; } - return set_string_option(opt_idx, s, opt_flags); + return set_string_option(opt_idx, s, opt_flags, errbuf, sizeof(errbuf)); } char_u *varp = (char_u *)get_varp_scope(&(options[opt_idx]), opt_flags); @@ -3144,7 +3146,7 @@ char *set_option_value(const char *const name, const long number, const char *co } } if (flags & P_NUM) { - return set_num_option(opt_idx, varp, numval, NULL, 0, opt_flags); + return set_num_option(opt_idx, varp, numval, errbuf, sizeof(errbuf), opt_flags); } return set_bool_option(opt_idx, (char *)varp, (int)numval, opt_flags); } |