patch 9.1.0641: MS-Windows: OLE enabled in console version
Commit:
https://github.com/vim/vim/commit/baaf6deb957e11227c6ffa5e22b48d9082ae7e77
Author: Ken Takata <ken...@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 <ken...@csc.jp>
Signed-off-by: Christian Brabandt <c...@256bit.org>
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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1sYVpn-001svf-PQ%40256bit.org.
