summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--runtime/doc/eval.txt6
-rw-r--r--src/gui_w32.c5
-rw-r--r--src/version.c2
3 files changed, 12 insertions, 1 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index d1a1ba3f21..bceb6800ef 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1660,7 +1660,11 @@ v:warningmsg Last given warning message. It's allowed to set this variable.
*v:windowid* *windowid-variable*
v:windowid When any X11 based GUI is running or when running in a
terminal and Vim connects to the X server (|-X|) this will be
- set to the window ID. Otherwise the value is zero.
+ set to the window ID.
+ When an MS-Windows GUI is running this will be set to the
+ window handle.
+ Otherwise the value is zero.
+ Note: for windows inside Vim use |winnr()|.
==============================================================================
4. Builtin Functions *functions*
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 5071423412..f3b9c5bb68 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -1573,6 +1573,11 @@ gui_mch_init(void)
# endif
#endif
+#ifdef FEAT_EVAL
+ /* set the v:windowid variable */
+ set_vim_var_nr(VV_WINDOWID, (long)s_hwnd);
+#endif
+
theend:
/* Display any pending error messages */
display_errors();
diff --git a/src/version.c b/src/version.c
index ed599f7663..d4244e1c02 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 38,
+/**/
37,
/**/
36,