thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.2086: code cleanup for option callbacks needed

Browse Source 
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>
This commit is contained in:
zeertzjq
2023-11-02 21:01:19 +01:00
committed by Christian Brabandt
parent 2b358adde0
commit deba02ddd4
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/option.c
View File

@@ -3680,7 +3680,6 @@ did_set_modifiable(optset_T *args UNUSED)
&& curbuf->b_term != NULL && !term_is_finished(curbuf)))) && curbuf->b_term != NULL && !term_is_finished(curbuf))))
{ {
curbuf->b_p_ma = FALSE; curbuf->b_p_ma = FALSE;
args->os_doskip = TRUE;
return e_cannot_make_terminal_with_running_job_modifiable; return e_cannot_make_terminal_with_running_job_modifiable;
} }
# endif # endif
@@ -3942,7 +3941,6 @@ did_set_previewwindow(optset_T *args)
if (win->w_p_pvw && win != curwin) if (win->w_p_pvw && win != curwin)
{ {
curwin->w_p_pvw = FALSE; curwin->w_p_pvw = FALSE;
args->os_doskip = TRUE;
return e_preview_window_already_exists; return e_preview_window_already_exists;
} }
@@ -4130,7 +4128,6 @@ did_set_termguicolors(optset_T *args UNUSED)
!has_vtp_working()) !has_vtp_working())
{ {
p_tgc = 0; p_tgc = 0;
args->os_doskip = TRUE;
return e_24_bit_colors_are_not_supported_on_this_environment; return e_24_bit_colors_are_not_supported_on_this_environment;
} }
if (is_term_win32()) if (is_term_win32())
@@ -4602,7 +4599,7 @@ set_bool_option(
args.os_newval.boolean = value; args.os_newval.boolean = value;
args.os_errbuf = NULL; args.os_errbuf = NULL;
errmsg = options[opt_idx].opt_did_set_cb(&args); errmsg = options[opt_idx].opt_did_set_cb(&args);
if (args.os_doskip) if (errmsg != NULL)
return errmsg; return errmsg;
} }

4
src/structs.h
View File

@@ -4948,10 +4948,6 @@ typedef struct
char_u *string; char_u *string;
} os_newval; } 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 // Option value was checked to be safe, no need to set P_INSECURE
// Used for the 'keymap', 'filetype' and 'syntax' options. // Used for the 'keymap', 'filetype' and 'syntax' options.
int os_value_checked; int os_value_checked;

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2086,
/**/ /**/
2085, 2085,
/**/ /**/