0
0
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00

patch 8.0.1373: no error when settting 'renderoptions' before starting GUI

Problem:    No error when settting 'renderoptions' to an invalid value before
            starting the GUI.
Solution:   Always check the value. (Ken Takata, closes #2413)
This commit is contained in:
Bram Moolenaar
2017-12-05 16:57:56 +01:00
parent ac112f01a6
commit 3767c6e9ee
3 changed files with 6 additions and 1 deletions

View File

@@ -127,6 +127,9 @@ gui_mch_set_rendering_options(char_u *s)
return FAIL; return FAIL;
} }
if (!gui.in_use)
return OK; /* only checking the syntax of the value */
/* Enable DirectX/DirectWrite */ /* Enable DirectX/DirectWrite */
if (dx_enable) if (dx_enable)
{ {

View File

@@ -7406,7 +7406,7 @@ did_set_string_option(
#if defined(FEAT_RENDER_OPTIONS) #if defined(FEAT_RENDER_OPTIONS)
/* 'renderoptions' */ /* 'renderoptions' */
else if (varp == &p_rop && gui.in_use) else if (varp == &p_rop)
{ {
if (!gui_mch_set_rendering_options(p_rop)) if (!gui_mch_set_rendering_options(p_rop))
errmsg = e_invarg; errmsg = e_invarg;

View File

@@ -771,6 +771,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 */
/**/
1373,
/**/ /**/
1372, 1372,
/**/ /**/