updated for version 7.3.530

Problem:    Gvim does not work when 'guioptions' includes "f". (Davido)
Solution:   Call gui_mch_init_check() when running GUI in the foreground.
            (Yasuhiro Matsumoto)

diff --git a/src/gui.c b/src/gui.c
index b216121cfe9a002f073421fadd01ebc484c93eee..ed80844f45f9ed50f0bf3d65d5c26071da7c8b04 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -102,6 +102,10 @@ gui_start()
     else
 #endif
     {
+       /* If there is 'f' in 'guioptions' and specify -g argument,
+        * gui_mch_init_check() was not called yet.  */
+       if (gui_mch_init_check() != OK)
+           exit(1);
        gui_attempt_start();
     }
 

diff --git a/src/version.c b/src/version.c
index fa1313acde56993fb1804bc4f16519e33d0e3133..516737923a9632ec71fcde3e4a708fa4b304ce97 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    530,
 /**/
     529,
 /**/