diff options
| author | Lewis Russell <lewis6991@gmail.com> | 2023-07-12 13:56:33 +0100 |
|---|---|---|
| committer | Lewis Russell <lewis6991@gmail.com> | 2023-08-31 15:07:04 +0100 |
| commit | 3b02e1281ad9fff8f8817868996e83e9f69cb8a1 (patch) | |
| tree | 0782c3959316903c91ddf659c7e863cf9ce7903c | |
| parent | 4b0b798ebae8f4f618c02b3adf30077c9dcc48b0 (diff) | |
| download | rneovim-3b02e1281ad9fff8f8817868996e83e9f69cb8a1.tar.gz rneovim-3b02e1281ad9fff8f8817868996e83e9f69cb8a1.tar.bz2 rneovim-3b02e1281ad9fff8f8817868996e83e9f69cb8a1.zip | |
refactor(option.c): remove did_set_string_option alias
| -rw-r--r-- | src/nvim/option.c | 2 | ||||
| -rw-r--r-- | src/nvim/optionstr.c | 17 |
2 files changed, 6 insertions, 13 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index ffceeb6a5a..ad0d6a0266 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1172,7 +1172,7 @@ static void do_set_option_string(int opt_idx, int opt_flags, char **argp, int ne // Handle side effects, and set the global value for ":set" on local // options. Note: when setting 'syntax' or 'filetype' autocommands may // be triggered that can cause havoc. - *errmsg = did_set_string_option(opt_idx, (char **)varp, oldval, newval, + *errmsg = did_set_string_option(curbuf, curwin, opt_idx, (char **)varp, oldval, newval, errbuf, errbuflen, opt_flags, value_checked); diff --git a/src/nvim/optionstr.c b/src/nvim/optionstr.c index 07e2e5eed1..60ad246293 100644 --- a/src/nvim/optionstr.c +++ b/src/nvim/optionstr.c @@ -459,8 +459,8 @@ const char *set_string_option(const int opt_idx, const char *const value, const char *const saved_newval = xstrdup(s); int value_checked = false; - const char *const errmsg = did_set_string_option(opt_idx, varp, oldval, s, errbuf, errbuflen, - opt_flags, &value_checked); + const char *const errmsg = did_set_string_option(curbuf, curwin, opt_idx, varp, oldval, s, errbuf, + errbuflen, opt_flags, &value_checked); if (errmsg == NULL) { did_set_option(opt_idx, opt_flags, true, value_checked); } @@ -2066,9 +2066,9 @@ static void do_spelllang_source(win_T *win) /// @param value_checked value was checked to be safe, no need to set P_INSECURE /// /// @return NULL for success, or an untranslated error message for an error -static const char *did_set_string_option_for(buf_T *buf, win_T *win, int opt_idx, char **varp, - char *oldval, const char *value, char *errbuf, - size_t errbuflen, int opt_flags, int *value_checked) +const char *did_set_string_option(buf_T *buf, win_T *win, int opt_idx, char **varp, char *oldval, + const char *value, char *errbuf, size_t errbuflen, int opt_flags, + int *value_checked) { const char *errmsg = NULL; int restore_chartab = false; @@ -2186,13 +2186,6 @@ static const char *did_set_string_option_for(buf_T *buf, win_T *win, int opt_idx return errmsg; } -const char *did_set_string_option(int opt_idx, char **varp, char *oldval, char *value, char *errbuf, - size_t errbuflen, int opt_flags, int *value_checked) -{ - return did_set_string_option_for(curbuf, curwin, opt_idx, varp, oldval, value, errbuf, - errbuflen, opt_flags, value_checked); -} - /// Check an option that can be a range of string values. /// /// @param list when true: accept a list of values |