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>

diff --git a/src/gui_w32.c b/src/gui_w32.c
index 721c4480d52fc5e82906212c4fcb5fdcd198fea6..78f252a8b75d3dbe867caff95000e9bb85b71766 100644 (file)
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -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;
 

diff --git a/src/version.c b/src/version.c
index 53c1118937eb6041d5778488fa1e4577743aea01..8afbd0148777ef22cbf14e3a100c6695853d4918 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    641,
 /**/
     640,
 /**/