From 4c365548a2364734db16696cd6df4acd75b868d8 Mon Sep 17 00:00:00 2001 From: Lewis Russell Date: Mon, 23 Jan 2023 10:13:27 +0000 Subject: refactor(optionstr.c): break up did_set_string_option 38 --- src/nvim/optionstr.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/nvim/optionstr.c b/src/nvim/optionstr.c index ec206ca074..36fd0fb6c8 100644 --- a/src/nvim/optionstr.c +++ b/src/nvim/optionstr.c @@ -745,6 +745,13 @@ static void did_set_sessionoptions(char *oldval, char **errmsg) } } +static void did_set_scrollopt(char **errmsg) +{ + if (check_opt_strings(p_sbo, p_scbopt_values, true) != OK) { + *errmsg = e_invarg; + } +} + static void did_set_ambiwidth(char **errmsg) { if (check_opt_strings(p_ambw, p_ambw_values, false) != OK) { @@ -1460,9 +1467,7 @@ char *did_set_string_option(int opt_idx, char **varp, char *oldval, char *errbuf errmsg = e_invarg; } } else if (varp == &p_sbo) { // 'scrollopt' - if (check_opt_strings(p_sbo, p_scbopt_values, true) != OK) { - errmsg = e_invarg; - } + did_set_scrollopt(&errmsg); } else if (varp == &p_ambw || (int *)varp == &p_emoji) { // 'ambiwidth' did_set_ambiwidth(&errmsg); } else if (varp == &p_bg) { // 'background' -- cgit