Compare commits

...

4 Commits

Author SHA1 Message Date
Bram Moolenaar
00ce63dc23 patch 8.0.1198: older compilers don't know uint8_t
Problem:    Older compilers don't know uint8_t.
Solution:   Use char_u instead.
2017-10-15 21:44:45 +02:00
Bram Moolenaar
81b07b527e patch 8.0.1197: MS-Windows build instructions are not up to date
Problem:    MS-Windows build instructions are not up to date.
Solution:   Adjust the instructions.  Fix the nsis script.
2017-10-15 21:43:21 +02:00
Bram Moolenaar
a20f83df1d patch 8.0.1196: crash when t_RF is not set
Problem:    Crash when t_RF is not set. (Brian Pina)
Solution:   Add t_RF to the list of terminal options. (Hirohito Higashi)
2017-10-15 13:35:01 +02:00
Bram Moolenaar
9377df3ecd patch 8.0.1195: can't build on MS-Windows
Problem:    Can't build on MS-Windows.
Solution:   Adjust #ifdef and add #ifdefs.
2017-10-15 13:22:01 +02:00
7 changed files with 27 additions and 12 deletions

View File

@@ -131,6 +131,7 @@ MINOR = 0
# - > make dossrc
# > make dosrt
# Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
# This creates the directory vim/vim80 and puts all files in there.
# Win32 console version build:
# - See src/INSTALLpc.txt for installing the compiler and SDK.
# - Set environment for Visual C++ 2015:
@@ -186,8 +187,9 @@ MINOR = 0
# gvimext64.dll in src/GvimExt
# VisVim.dll in src/VisVim
# Note: VisVim needs to be build with MSVC 5, newer versions don't work.
# gvimext64.dll can be obtained from http://code.google.com/p/vim-win3264/
# It is part of vim72.zip as vim72/gvimext.dll.
# gvimext64.dll can be obtained from:
# https://github.com/vim/vim-win32-installer/releases
# It is part of gvim_8.0.*_x64.zip as vim/vim80/GvimExt/gvimext64.dll.
# - Make sure there is a diff.exe two levels up (get it from a previous Vim
# version). Also put winpty32.dll and winpty-agent.exe there.
# - go to ../nsis and do:

View File

@@ -351,7 +351,7 @@ Section "Add an Edit-with-Vim context menu entry"
# Can't copy gvimext.dll, create it under another name and rename it
# on next reboot.
GetTempFileName $3 $0\GvimExt64
File /oname=$3 ${VIMSRC}\GvimExt64\gvimext.dll
File /oname=$3 ${VIMSRC}\GvimExt\gvimext64.dll
Rename /REBOOTOK $3 $0\GvimExt64\gvimext.dll
!ifdef HAVE_NLS
GetTempFileName $3 $0\GvimExt64

View File

@@ -3141,6 +3141,7 @@ static struct vimoption options[] =
p_term("t_ms", T_MS)
p_term("t_nd", T_ND)
p_term("t_op", T_OP)
p_term("t_RF", T_RFG)
p_term("t_RB", T_RBG)
p_term("t_RC", T_CRC)
p_term("t_RI", T_CRI)

View File

@@ -64,8 +64,8 @@ char_u *get_termcode(int i);
void del_termcode(char_u *name);
void set_mouse_topline(win_T *wp);
int check_termcode(int max_offset, char_u *buf, int bufsize, int *buflen);
void term_get_fg_color(uint8_t *r, uint8_t *g, uint8_t *b);
void term_get_bg_color(uint8_t *r, uint8_t *g, uint8_t *b);
void term_get_fg_color(char_u *r, char_u *g, char_u *b);
void term_get_bg_color(char_u *r, char_u *g, char_u *b);
char_u *replace_termcodes(char_u *from, char_u **bufp, int from_part, int do_lt, int special);
int find_term_bykeys(char_u *src);
void show_termcodes(void);

View File

@@ -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;
@@ -3529,7 +3529,7 @@ may_req_bg_color(void)
{
int didit = FALSE;
#ifdef FEAT_TERMINAL
# ifdef FEAT_TERMINAL
/* Only request foreground if t_RF is set. */
if (rfg_status == STATUS_GET && *T_RFG != NUL)
{
@@ -3538,7 +3538,7 @@ may_req_bg_color(void)
rfg_status = STATUS_SENT;
didit = TRUE;
}
#endif
# endif
/* Only request background if t_RB is set. */
if (rbg_status == STATUS_GET && *T_RBG != NUL)
@@ -5828,12 +5828,12 @@ 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.
*/
void
term_get_fg_color(uint8_t *r, uint8_t *g, uint8_t *b)
term_get_fg_color(char_u *r, char_u *g, char_u *b)
{
if (rfg_status == STATUS_GOT)
{
@@ -5847,7 +5847,7 @@ term_get_fg_color(uint8_t *r, uint8_t *g, uint8_t *b)
* Get the text background color, if known.
*/
void
term_get_bg_color(uint8_t *r, uint8_t *g, uint8_t *b)
term_get_bg_color(char_u *r, char_u *g, char_u *b)
{
if (rbg_status == STATUS_GOT)
{

View File

@@ -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);

View File

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