Mercurial > vim

changeset 3539:81d5f3a3e27f v7.3.530

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Fri, 25 May 2012 14:06:36 +0200
parents 57b2fe37fd5b
children 809cb68ebb2b
files src/gui.c src/version.c
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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();
     }
 
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    530,
+/**/
     529,
 /**/
     528,