diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-11-02 21:01:19 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-11-02 21:01:19 +0100 |
| commit | deba02ddd46e9e8adfe2f7800c6be19d8c8e1a4d (patch) | |
| tree | 3ba3c10ae5e18aa06d8bb5f211deaffbe9f58d9d /src | |
| parent | 2b358adde079d7cc8a7f42fcd5627866641c9a59 (diff) | |
patch 9.0.2086: code cleanup for option callbacks neededv9.0.2086
Problem: code cleanup for option callbacks needed
Solution: remove flag os_doskip, it's not necessary, as we can check,
whether an error message was returned
Remove unnecessary field os_doskip
Callback functions for boolean options set os_doskip immediately before
returning an error message, so os_doskip isn't actually needed.
closes: #13461
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/option.c | 5 | ||||
| -rw-r--r-- | src/structs.h | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/option.c b/src/option.c index 35529a576e..d5d20d7674 100644 --- a/src/option.c +++ b/src/option.c @@ -3680,7 +3680,6 @@ did_set_modifiable(optset_T *args UNUSED) && curbuf->b_term != NULL && !term_is_finished(curbuf)))) { curbuf->b_p_ma = FALSE; - args->os_doskip = TRUE; return e_cannot_make_terminal_with_running_job_modifiable; } # endif @@ -3942,7 +3941,6 @@ did_set_previewwindow(optset_T *args) if (win->w_p_pvw && win != curwin) { curwin->w_p_pvw = FALSE; - args->os_doskip = TRUE; return e_preview_window_already_exists; } @@ -4130,7 +4128,6 @@ did_set_termguicolors(optset_T *args UNUSED) !has_vtp_working()) { p_tgc = 0; - args->os_doskip = TRUE; return e_24_bit_colors_are_not_supported_on_this_environment; } if (is_term_win32()) @@ -4602,7 +4599,7 @@ set_bool_option( args.os_newval.boolean = value; args.os_errbuf = NULL; errmsg = options[opt_idx].opt_did_set_cb(&args); - if (args.os_doskip) + if (errmsg != NULL) return errmsg; } diff --git a/src/structs.h b/src/structs.h index 36968741e3..4e081b860e 100644 --- a/src/structs.h +++ b/src/structs.h @@ -4948,10 +4948,6 @@ typedef struct char_u *string; } os_newval; - // When set by the called function: Stop processing the option further. - // Currently only used for boolean options. - int os_doskip; - // Option value was checked to be safe, no need to set P_INSECURE // Used for the 'keymap', 'filetype' and 'syntax' options. int os_value_checked; diff --git a/src/version.c b/src/version.c index e136a671ec..83ac9db565 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2086, +/**/ 2085, /**/ 2084, |