patch 8.2.0658: HP-UX build fails when setenv() is not defined

Problem:    HP-UX build fails when setenv() is not defined.
Solution:   Change "colors" to "t_colors". (John Marriott)

diff --git a/src/os_unix.c b/src/os_unix.c
index 66903e081902f065168fe4df6c5b556ded5cd05f..f8fe2cb64b14f669b543eb7a12f0cc3414c2bf87 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4196,7 +4196,7 @@ set_child_environment(
     vim_snprintf(envbuf_Columns, sizeof(envbuf_Columns),
                                                       "COLUMNS=%ld", columns);
     putenv(envbuf_Columns);
-    vim_snprintf(envbuf_Colors, sizeof(envbuf_Colors), "COLORS=%ld", colors);
+    vim_snprintf(envbuf_Colors, sizeof(envbuf_Colors), "COLORS=%ld", t_colors);
     putenv(envbuf_Colors);
 #  ifdef FEAT_TERMINAL
     if (is_terminal)

diff --git a/src/version.c b/src/version.c
index eac5c9adfa55b086663d58d866c44d6e32eb08ab..127f9062911b410bdf4186dd1e41360f7cac42cb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    658,
 /**/
     657,
 /**/