patch 8.1.0050: $VIM_TERMINAL is also set when not in a terminal window
Problem: $VIM_TERMINAL is also set when not in a terminal window.
Solution: Pass a flag to indicate whether the job runs in a terminal.
diff --git a/src/os_win32.c b/src/os_win32.c
index 3b0291e..f340949 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -5275,26 +5275,31 @@
}
}
- if (is_terminal)
+# if defined(FEAT_CLIENTSERVER) || defined(FEAT_TERMINAL)
{
-# ifdef FEAT_CLIENTSERVER
+# ifdef FEAT_CLIENTSERVER
char_u *servername = get_vim_var_str(VV_SEND_SERVER);
size_t servername_len = STRLEN(servername);
-# endif
+# endif
+# ifdef FEAT_TERMINAL
char_u *version = get_vim_var_str(VV_VERSION);
size_t version_len = STRLEN(version);
+# endif
// size of "VIM_SERVERNAME=" and value,
// plus "VIM_TERMINAL=" and value,
// plus two terminating NULs
size_t n = 0
-# ifdef FEAT_CLIENTSERVER
+# ifdef FEAT_CLIENTSERVER
+ 15 + servername_len
-# endif
- + 13 + version_len + 2;
+# endif
+# ifdef FEAT_TERMINAL
+ + 13 + version_len + 2
+# endif
+ ;
if (ga_grow(gap, (int)n) == OK)
{
-# ifdef FEAT_CLIENTSERVER
+# ifdef FEAT_CLIENTSERVER
for (n = 0; n < 15; n++)
*((WCHAR*)gap->ga_data + gap->ga_len++) =
(WCHAR)"VIM_SERVERNAME="[n];
@@ -5302,14 +5307,19 @@
*((WCHAR*)gap->ga_data + gap->ga_len++) =
(WCHAR)servername[n];
*((WCHAR*)gap->ga_data + gap->ga_len++) = L'\0';
-# endif
- for (n = 0; n < 13; n++)
- *((WCHAR*)gap->ga_data + gap->ga_len++) =
- (WCHAR)"VIM_TERMINAL="[n];
- for (n = 0; n < version_len; n++)
- *((WCHAR*)gap->ga_data + gap->ga_len++) =
- (WCHAR)version[n];
- *((WCHAR*)gap->ga_data + gap->ga_len++) = L'\0';
+# endif
+# ifdef FEAT_TERMINAL
+ if (is_terminal)
+ {
+ for (n = 0; n < 13; n++)
+ *((WCHAR*)gap->ga_data + gap->ga_len++) =
+ (WCHAR)"VIM_TERMINAL="[n];
+ for (n = 0; n < version_len; n++)
+ *((WCHAR*)gap->ga_data + gap->ga_len++) =
+ (WCHAR)version[n];
+ *((WCHAR*)gap->ga_data + gap->ga_len++) = L'\0';
+ }
+# endif
}
}
}