summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-05-01 17:30:41 +0200
committerBram Moolenaar <Bram@vim.org>2018-05-01 17:30:41 +0200
commit8a938af6ddefab4b4bc751d3f3545e1d95622c8a (patch)
tree485213ff1583351117ba8f45c451f6f5a63692de
parentbc7845da935c0707e119812077cecd6cfb5a65e2 (diff)
downloadvim-git-8a938af6ddefab4b4bc751d3f3545e1d95622c8a.tar.gz
patch 8.0.1785: missing symbol in Win32 small buildv8.0.1785
Problem: Missing symbol in Win32 small build. Solution: Define VTERM_ANSI_INDEX_NONE without the terminal feature. Also fix unused function with #ifdef.
-rw-r--r--src/os_win32.c2
-rw-r--r--src/term.c2
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/os_win32.c b/src/os_win32.c
index 8278ddd02..c474415c8 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -7656,6 +7656,7 @@ vtp_sgr_bulks(
vtp_printf((char *)buf);
}
+# ifdef FEAT_TERMGUICOLORS
static int
ctermtoxterm(
int cterm)
@@ -7665,6 +7666,7 @@ ctermtoxterm(
cterm_color2rgb(cterm, &r, &g, &b, &idx);
return (((int)r << 16) | ((int)g << 8) | (int)b);
}
+# endif
static void
set_console_color_rgb(void)
diff --git a/src/term.c b/src/term.c
index d2a6e4583..08eee67f5 100644
--- a/src/term.c
+++ b/src/term.c
@@ -6977,6 +6977,8 @@ static int grey_ramp[] = {
# ifdef FEAT_TERMINAL
# include "libvterm/include/vterm.h" // for VTERM_ANSI_INDEX_NONE
+# else
+# define VTERM_ANSI_INDEX_NONE 0
# endif
static uint8_t ansi_table[16][4] = {
diff --git a/src/version.c b/src/version.c
index 16d0eb0fd..01bd9a16e 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 */
/**/
+ 1785,
+/**/
1784,
/**/
1783,