summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/term.c6
-rw-r--r--src/terminal.c4
-rw-r--r--src/version.c2
3 files changed, 9 insertions, 3 deletions
diff --git a/src/term.c b/src/term.c
index f61806980..7a48f995a 100644
--- 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 9519c819f..7aa0a408e 100644
--- 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 a762e1ec0..5e87e258f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1195,
+/**/
1194,
/**/
1193,