patch 9.0.2086: code cleanup for option callbacks needed

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>

diff --git a/src/option.c b/src/option.c
index 35529a576e7a1a737f8ac219065e8e686757fe9c..d5d20d7674aa60c42fa427b4595f3f6bdbe0aada 100644 (file)
--- 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 36968741e34c2c9e00b9d89b6dd5afe6082263e7..4e081b860ef459bef9fd52db0442d4adb639110f 100644 (file)
--- 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 e136a671eced67c5b258e910c153e58dcad3c30f..83ac9db565e1b13f7a11e4863cbeadd9a03a7344 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2086,
 /**/
     2085,
 /**/