aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 7.4.2193

Browse Source 
Problem:    With Gnome when the GUI can't start test_startup hangs.
Solution:   Call gui_mch_early_init_check(). (Hirohito Higashi)
This commit is contained in:
Bram Moolenaar
2016-08-10 21:28:44 +02:00
parent a6b7a08ae0
commit 717e196060
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui.c
View File

@@ -447,7 +447,7 @@ gui_init_check(void)
* See gui_do_fork(). * See gui_do_fork().
* Use a simpler check if the GUI window can probably be opened. * 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 # else
result = gui_mch_init_check(); result = gui_mch_init_check();
# endif # endif

11
src/gui_gtk_x11.c
View File

@@ -542,8 +542,10 @@ gui_mch_prepare(int *argc, char **argv)
} }
/* These arguments make gnome_program_init() print a message and exit. /* These arguments make gnome_program_init() print a message and exit.
* Must start the GUI for this, otherwise ":gui" will exit later! */ * Must start the GUI for this, otherwise ":gui" will exit later!
if (option->flags & ARG_NEEDS_GUI) * Only when the GUI can start. */
if ((option->flags & ARG_NEEDS_GUI)
&& gui_mch_early_init_check(FALSE) == OK)
gui.starting = TRUE; gui.starting = TRUE;
if (option->flags & ARG_KEEP) if (option->flags & ARG_KEEP)
@@ -1663,7 +1665,7 @@ selection_get_cb(GtkWidget *widget UNUSED,
* Return OK or FAIL. * Return OK or FAIL.
*/ */
int int
gui_mch_early_init_check(void) gui_mch_early_init_check(int give_message)
{ {
char_u *p; char_u *p;
@@ -1672,7 +1674,8 @@ gui_mch_early_init_check(void)
if (p == NULL || *p == NUL) if (p == NULL || *p == NUL)
{ {
gui.dying = TRUE; gui.dying = TRUE;
EMSG(_((char *)e_opendisp)); if (give_message)
EMSG(_((char *)e_opendisp));
return FAIL; return FAIL;
} }
return OK; return OK;

2
src/proto/gui_gtk_x11.pro
View File

@@ -6,7 +6,7 @@ int gui_mch_is_blink_off(void);
void gui_mch_set_blinking(long waittime, long on, long off); void gui_mch_set_blinking(long waittime, long on, long off);
void gui_mch_stop_blink(void); void gui_mch_stop_blink(void);
void gui_mch_start_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); int gui_mch_init_check(void);
void gui_mch_show_tabline(int showit); void gui_mch_show_tabline(int showit);
int gui_mch_showing_tabline(void); int gui_mch_showing_tabline(void);

2
src/version.c
View File

@@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2193,
/**/ /**/
2192, 2192,
/**/ /**/