# HG changeset patch # User Christian Brabandt # Date 1512489608 -3600 # Node ID 8566eaa08788755076500128c7511fa3ce313fde # Parent 8a97cfc76c7ec7d9bfa45d275ba498691f5ec4d3 patch 8.0.1373: no error when settting 'renderoptions' before starting GUI commit https://github.com/vim/vim/commit/3767c6e9ee1bd585a2afba7e932854b24d194a2d Author: Bram Moolenaar Date: Tue Dec 5 16:57:56 2017 +0100 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) diff --git a/src/gui_w32.c b/src/gui_w32.c --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -127,6 +127,9 @@ gui_mch_set_rendering_options(char_u *s) return FAIL; } + if (!gui.in_use) + return OK; /* only checking the syntax of the value */ + /* Enable DirectX/DirectWrite */ if (dx_enable) { diff --git a/src/option.c b/src/option.c --- a/src/option.c +++ b/src/option.c @@ -7406,7 +7406,7 @@ did_set_string_option( #if defined(FEAT_RENDER_OPTIONS) /* 'renderoptions' */ - else if (varp == &p_rop && gui.in_use) + else if (varp == &p_rop) { if (!gui_mch_set_rendering_options(p_rop)) errmsg = e_invarg; diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1373, +/**/ 1372, /**/ 1371,