aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.0.1195: can't build on MS-Windows

Browse Source 
Problem:    Can't build on MS-Windows.
Solution:   Adjust #ifdef and add #ifdefs.
This commit is contained in:
Bram Moolenaar
2017-10-15 13:22:01 +02:00
parent 65e4c4f686
commit 9377df3ecd
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/term.c
View File

@@ -125,7 +125,7 @@ static int crv_status = STATUS_GET;
/* Request Cursor position report: */ /* Request Cursor position report: */
static int u7_status = STATUS_GET; static int u7_status = STATUS_GET;
#ifdef FEAT_TERMINAL # ifdef FEAT_TERMINAL
/* Request foreground color report: */ /* Request foreground color report: */
static int rfg_status = STATUS_GET; static int rfg_status = STATUS_GET;
static int fg_r = 0; static int fg_r = 0;
@@ -134,7 +134,7 @@ static int fg_b = 0;
static int bg_r = 255; static int bg_r = 255;
static int bg_g = 255; static int bg_g = 255;
static int bg_b = 255; static int bg_b = 255;
#endif # endif
/* Request background color report: */ /* Request background color report: */
static int rbg_status = STATUS_GET; static int rbg_status = STATUS_GET;
@@ -5828,7 +5828,7 @@ check_termcode(
return 0; /* no match found */ 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. * Get the text foreground color, if known.
*/ */

4
src/terminal.c
View File

@@ -2624,8 +2624,10 @@ create_vterm(term_T *term, int rows, int cols)
fg->blue = tmp; fg->blue = tmp;
# endif # endif
} }
# ifdef FEAT_TERMRESPONSE
else else
term_get_fg_color(&fg->red, &fg->green, &fg->blue); term_get_fg_color(&fg->red, &fg->green, &fg->blue);
# endif
if (cterm_normal_bg_color > 0) if (cterm_normal_bg_color > 0)
{ {
@@ -2636,8 +2638,10 @@ create_vterm(term_T *term, int rows, int cols)
bg->blue = tmp; bg->blue = tmp;
# endif # endif
} }
# ifdef FEAT_TERMRESPONSE
else else
term_get_bg_color(&bg->red, &bg->green, &bg->blue); term_get_bg_color(&bg->red, &bg->green, &bg->blue);
# endif
} }
vterm_state_set_default_colors(vterm_obtain_state(vterm), fg, bg); vterm_state_set_default_colors(vterm_obtain_state(vterm), fg, bg);

2
src/version.c
View File

@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1195,
/**/ /**/
1194, 1194,
/**/ /**/