From baaf6deb957e11227c6ffa5e22b48d9082ae7e77 Mon Sep 17 00:00:00 2001 From: Ken Takata Date: Mon, 29 Jul 2024 20:57:19 +0200 Subject: [PATCH] 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 Signed-off-by: Christian Brabandt --- src/gui_w32.c | 3 +++ src/version.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/gui_w32.c b/src/gui_w32.c index 721c4480d..78f252a8b 100644 --- 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 53c111893..8afbd0148 100644 --- 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, /**/