aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-03 21:23:48 -04:00
Code

patch 8.2.0055: cannot use ":gui" in vimrc with VIMDLL enabled

Browse Source 
Problem:    Cannot use ":gui" in vimrc with VIMDLL enabled.
Solution:   Change the logic, check "gui.starting". (Ken Takata, closes #5408)
This commit is contained in:
Bram Moolenaar 2019-12-29 15:19:03 +01:00
parent ae7dba8969
commit 257a396879
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui.c
View File

@ -5010,21 +5010,23 @@ ex_gui(exarg_T *eap)
if (!gui.in_use) if (!gui.in_use)
{ {
#if defined(VIMDLL) && !defined(EXPERIMENTAL_GUI_CMD) #if defined(VIMDLL) && !defined(EXPERIMENTAL_GUI_CMD)
emsg(_(e_nogvim)); if (!gui.starting)
return; {
#else emsg(_(e_nogvim));
return;
}
#endif
// Clear the command. Needed for when forking+exiting, to avoid part // Clear the command. Needed for when forking+exiting, to avoid part
// of the argument ending up after the shell prompt. // of the argument ending up after the shell prompt.
msg_clr_eos_force(); msg_clr_eos_force();
# ifdef GUI_MAY_SPAWN #ifdef GUI_MAY_SPAWN
if (!ends_excmd(*eap->arg)) if (!ends_excmd(*eap->arg))
gui_start(eap->arg); gui_start(eap->arg);
else else
# endif #endif
gui_start(NULL); gui_start(NULL);
# ifdef FEAT_JOB_CHANNEL #ifdef FEAT_JOB_CHANNEL
channel_gui_register_all(); channel_gui_register_all();
# endif
#endif #endif
} }
if (!ends_excmd(*eap->arg)) if (!ends_excmd(*eap->arg))

2
src/version.c
View File

@ -742,6 +742,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 */
/**/
55,
/**/ /**/
54, 54,
/**/ /**/