patch 8.0.1665: when running a terminal from the GUI 'term' is not useful
Problem: When running a terminal from the GUI 'term' is not useful.
Solution: Use $TERM in the GUI if it starts with "xterm". (closes #2776)
diff --git a/src/os_unix.c b/src/os_unix.c
index b811ac3..42917c2 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5579,11 +5579,23 @@
# ifdef FEAT_TERMINAL
if (options->jo_term_rows > 0)
+ {
+ char *term = (char *)T_NAME;
+
+#ifdef FEAT_GUI
+ if (term_is_gui(T_NAME))
+ /* In the GUI 'term' is not what we want, use $TERM. */
+ term = getenv("TERM");
+#endif
+ /* Use 'term' or $TERM if it starts with "xterm", otherwise fall
+ * back to "xterm". */
+ if (term == NULL || *term == NUL || STRNCMP(term, "xterm", 5) != 0)
+ term = "xterm";
set_child_environment(
(long)options->jo_term_rows,
(long)options->jo_term_cols,
- STRNCMP(T_NAME, "xterm", 5) == 0
- ? (char *)T_NAME : "xterm");
+ term);
+ }
else
# endif
set_default_child_environment();
diff --git a/src/version.c b/src/version.c
index a9b4dca..b29d64c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1665,
+/**/
1664,
/**/
1663,