From 3767c6e9ee1bd585a2afba7e932854b24d194a2d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 5 Dec 2017 16:57:56 +0100 Subject: [PATCH] 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) --- src/gui_w32.c | 3 +++ src/option.c | 2 +- src/version.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui_w32.c b/src/gui_w32.c index c3178ba5d..119bcd579 100644 --- 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 index c97056bde..08fb789da 100644 --- 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 index 3e8422954..837ca025e 100644 --- a/src/version.c +++ b/src/version.c @@ -771,6 +771,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1373, /**/ 1372, /**/ -- 2.50.1