aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLewis Russell <lewis6991@gmail.com>2023-01-23 10:12:57 +0000
committerLewis Russell <lewis6991@gmail.com>2023-01-25 11:48:52 +0000
commit3ea6a45a125c8d613685890ddbc9ad2745d15b97 (patch)
tree7ae8da143ef6b67b5002e210372c799b1fd8431a /src
parentbc2c9b1a0836a891e28fa3cd75a7446b2440e925 (diff)
downloadrneovim-3ea6a45a125c8d613685890ddbc9ad2745d15b97.tar.gz
rneovim-3ea6a45a125c8d613685890ddbc9ad2745d15b97.tar.bz2
rneovim-3ea6a45a125c8d613685890ddbc9ad2745d15b97.zip
refactor(optionstr.c): break up did_set_string_option 37
Diffstat (limited to 'src')
-rw-r--r--src/nvim/optionstr.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/nvim/optionstr.c b/src/nvim/optionstr.c
index 47f304635b..ec206ca074 100644
--- a/src/nvim/optionstr.c
+++ b/src/nvim/optionstr.c
@@ -745,6 +745,15 @@ static void did_set_sessionoptions(char *oldval, char **errmsg)
}
}
+static void did_set_ambiwidth(char **errmsg)
+{
+ if (check_opt_strings(p_ambw, p_ambw_values, false) != OK) {
+ *errmsg = e_invarg;
+ } else {
+ *errmsg = check_chars_options();
+ }
+}
+
static void did_set_background(char **errmsg)
{
if (check_opt_strings(p_bg, p_bg_values, false) != OK) {
@@ -1455,11 +1464,7 @@ char *did_set_string_option(int opt_idx, char **varp, char *oldval, char *errbuf
errmsg = e_invarg;
}
} else if (varp == &p_ambw || (int *)varp == &p_emoji) { // 'ambiwidth'
- if (check_opt_strings(p_ambw, p_ambw_values, false) != OK) {
- errmsg = e_invarg;
- } else {
- errmsg = check_chars_options();
- }
+ did_set_ambiwidth(&errmsg);
} else if (varp == &p_bg) { // 'background'
did_set_background(&errmsg);
} else if (varp == &p_wim) { // 'wildmode'