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
index c3178ba5d38d5d2360f1a210c46c04fd22a8ba30..119bcd579063fe143ffd80fb78ebbfaeb1e0ce32 100644 (file)
--- 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 c97056bde1af758a042634fd99144dd7f24ded62..08fb789dad19b7c12330415ccc9ea7bd2bd25215 100644 (file)
--- 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 3e8422954410df4c492061cbeda786cde3aa1733..837ca025e9c4ac1bbb49810742775a8d3d3c72fe 100644 (file)
--- 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,
 /**/