Mercurial > vim

changeset 35846:2e828d6675ab v9.1.0641

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.1.0641: MS-Windows: OLE enabled in console version Commit: https://github.com/vim/vim/commit/baaf6deb957e11227c6ffa5e22b48d9082ae7e77 Author: Ken Takata <kentkt@csc.jp> Date: Mon Jul 29 20:57:19 2024 +0200 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>
author Christian Brabandt <cb@256bit.org>
date Mon, 29 Jul 2024 21:15:03 +0200
parents 895c9428e284
children 045648205c84
files src/gui_w32.c src/version.c
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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;
 
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    641,
+/**/
     640,
 /**/
     639,