patch 7.4.2193
Problem: With Gnome when the GUI can't start test_startup hangs.
Solution: Call gui_mch_early_init_check(). (Hirohito Higashi)
diff --git a/src/gui.c b/src/gui.c
index 88b5d7b..0d858ec 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -447,7 +447,7 @@
* See gui_do_fork().
* Use a simpler check if the GUI window can probably be opened.
*/
- result = gui.dofork ? gui_mch_early_init_check() : gui_mch_init_check();
+ result = gui.dofork ? gui_mch_early_init_check(TRUE) : gui_mch_init_check();
# else
result = gui_mch_init_check();
# endif
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 939ecde..7c63a49 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -542,8 +542,10 @@
}
/* These arguments make gnome_program_init() print a message and exit.
- * Must start the GUI for this, otherwise ":gui" will exit later! */
- if (option->flags & ARG_NEEDS_GUI)
+ * Must start the GUI for this, otherwise ":gui" will exit later!
+ * Only when the GUI can start. */
+ if ((option->flags & ARG_NEEDS_GUI)
+ && gui_mch_early_init_check(FALSE) == OK)
gui.starting = TRUE;
if (option->flags & ARG_KEEP)
@@ -1663,7 +1665,7 @@
* Return OK or FAIL.
*/
int
-gui_mch_early_init_check(void)
+gui_mch_early_init_check(int give_message)
{
char_u *p;
@@ -1672,7 +1674,8 @@
if (p == NULL || *p == NUL)
{
gui.dying = TRUE;
- EMSG(_((char *)e_opendisp));
+ if (give_message)
+ EMSG(_((char *)e_opendisp));
return FAIL;
}
return OK;
diff --git a/src/proto/gui_gtk_x11.pro b/src/proto/gui_gtk_x11.pro
index b79feb8..f663dba 100644
--- a/src/proto/gui_gtk_x11.pro
+++ b/src/proto/gui_gtk_x11.pro
@@ -6,7 +6,7 @@
void gui_mch_set_blinking(long waittime, long on, long off);
void gui_mch_stop_blink(void);
void gui_mch_start_blink(void);
-int gui_mch_early_init_check(void);
+int gui_mch_early_init_check(int give_message);
int gui_mch_init_check(void);
void gui_mch_show_tabline(int showit);
int gui_mch_showing_tabline(void);
diff --git a/src/version.c b/src/version.c
index c775c37..3adadd4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2193,
+/**/
2192,
/**/
2191,