Mercurial > vim

diff src/option.c @ 33702:26a3250fa5b2 v9.0.2086

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.2086: code cleanup for option callbacks needed Commit: https://github.com/vim/vim/commit/deba02ddd46e9e8adfe2f7800c6be19d8c8e1a4d Author: zeertzjq <zeertzjq@outlook.com> Date: Thu Nov 2 21:01:19 2023 +0100 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>
author Christian Brabandt <cb@256bit.org>
date Thu, 02 Nov 2023 21:15:04 +0100
parents 09d88190c05c
children 6e4c686b6b5b
line wrap: on
line diff
--- 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 UNU
 	    !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;
     }