forked from aniani/vim
patch 9.1.0641: MS-Windows: OLE enabled in console version
Problem: MS-Windows: OLE enabled in console version, may cause hang (Linda_pp) Solution: Disable OLE for console version (Ken Takata) If VIMDLL was enabled, a message box for registering OLE might be shown even if Vim was executed in a console. (See #15372) Enabling OLE in a console is not so useful. Disable it. fixes: #15372 closes: #15385 Signed-off-by: Ken Takata <kentkt@csc.jp> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
011f2223e5
commit
baaf6deb95
@@ -5522,6 +5522,9 @@ gui_mch_prepare(int *argc, char **argv)
|
||||
}
|
||||
|
||||
#ifdef FEAT_OLE
|
||||
# ifdef VIMDLL
|
||||
if (mch_is_gui_executable())
|
||||
# endif
|
||||
{
|
||||
int bDoRestart = FALSE;
|
||||
|
||||
|
@@ -704,6 +704,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
641,
|
||||
/**/
|
||||
640,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user