To: vim_dev@googlegroups.com Subject: Patch 8.0.1373 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.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) Files: src/gui_w32.c, src/option.c *** ../vim-8.0.1372/src/gui_w32.c 2017-12-05 13:22:08.414402079 +0100 --- src/gui_w32.c 2017-12-05 16:54:52.543653823 +0100 *************** *** 127,132 **** --- 127,135 ---- return FAIL; } + if (!gui.in_use) + return OK; /* only checking the syntax of the value */ + /* Enable DirectX/DirectWrite */ if (dx_enable) { *** ../vim-8.0.1372/src/option.c 2017-11-26 23:47:14.219034826 +0100 --- src/option.c 2017-12-05 16:55:10.151557127 +0100 *************** *** 7406,7412 **** #if defined(FEAT_RENDER_OPTIONS) /* 'renderoptions' */ ! else if (varp == &p_rop && gui.in_use) { if (!gui_mch_set_rendering_options(p_rop)) errmsg = e_invarg; --- 7406,7412 ---- #if defined(FEAT_RENDER_OPTIONS) /* 'renderoptions' */ ! else if (varp == &p_rop) { if (!gui_mch_set_rendering_options(p_rop)) errmsg = e_invarg; *** ../vim-8.0.1372/src/version.c 2017-12-05 16:46:21.074478017 +0100 --- src/version.c 2017-12-05 16:56:45.879031830 +0100 *************** *** 773,774 **** --- 773,776 ---- { /* Add new patch number below this line */ + /**/ + 1373, /**/ -- Ed's Radiator Shop: The Best Place in Town to Take a Leak. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///