patch 8.0.1195: can't build on MS-Windows

Problem:    Can't build on MS-Windows.
Solution:   Adjust #ifdef and add #ifdefs.

diff --git a/src/term.c b/src/term.c
index f61806980c600fca397dfbe2de7644b092e65a11..7a48f995acff94c27844cd98bd4301e2546cf986 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -125,7 +125,7 @@ static int crv_status = STATUS_GET;
 /* Request Cursor position report: */
 static int u7_status = STATUS_GET;
 
-#ifdef FEAT_TERMINAL
+#  ifdef FEAT_TERMINAL
 /* Request foreground color report: */
 static int rfg_status = STATUS_GET;
 static int fg_r = 0;
@@ -134,7 +134,7 @@ static int fg_b = 0;
 static int bg_r = 255;
 static int bg_g = 255;
 static int bg_b = 255;
-#endif
+#  endif
 
 /* Request background color report: */
 static int rbg_status = STATUS_GET;
@@ -5828,7 +5828,7 @@ check_termcode(
     return 0;                      /* no match found */
 }
 
-#if defined(FEAT_TERMINAL) || defined(PROTO)
+#if (defined(FEAT_TERMINAL) && defined(FEAT_TERMRESPONSE)) || defined(PROTO)
 /*
  * Get the text foreground color, if known.
  */

diff --git a/src/terminal.c b/src/terminal.c
index 9519c819fabda0a6ab11c919765b28d5cee4790b..7aa0a408eff5ecee85a93ff2eeaf760b547f23ba 100644 (file)
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -2624,8 +2624,10 @@ create_vterm(term_T *term, int rows, int cols)
            fg->blue = tmp;
 # endif
        }
+# ifdef FEAT_TERMRESPONSE
        else
            term_get_fg_color(&fg->red, &fg->green, &fg->blue);
+# endif
 
        if (cterm_normal_bg_color > 0)
        {
@@ -2636,8 +2638,10 @@ create_vterm(term_T *term, int rows, int cols)
            bg->blue = tmp;
 # endif
        }
+# ifdef FEAT_TERMRESPONSE
        else
            term_get_bg_color(&bg->red, &bg->green, &bg->blue);
+# endif
     }
 
     vterm_state_set_default_colors(vterm_obtain_state(vterm), fg, bg);

diff --git a/src/version.c b/src/version.c
index a762e1ec05ceb9cc27cb419616319d0a41a7cd66..5e87e258f0db3d958aa830f1498f00bd4d4b5fe6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1195,
 /**/
     1194,
 /**/