diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-12-05 16:57:56 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-12-05 16:57:56 +0100 |
| commit | 3767c6e9ee1bd585a2afba7e932854b24d194a2d (patch) | |
| tree | 15551fa5d9477a811d2b85015555f4e532113360 | |
| parent | ac112f01a6930c9d15cf0360b657373699916bfd (diff) | |
patch 8.0.1373: no error when settting 'renderoptions' before starting GUIv8.0.1373
Problem: No error when settting 'renderoptions' to an invalid value before
starting the GUI.
Solution: Always check the value. (Ken Takata, closes #2413)
| -rw-r--r-- | src/gui_w32.c | 3 | ||||
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index c3178ba5d3..119bcd5790 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 c97056bde1..08fb789dad 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 3e84229544..837ca025e9 100644 --- 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, |