patch 8.0.1785: missing symbol in Win32 small build

Problem:    Missing symbol in Win32 small build.
Solution:   Define VTERM_ANSI_INDEX_NONE without the terminal feature. Also
            fix unused function with #ifdef.

diff --git a/src/os_win32.c b/src/os_win32.c
index 8278ddd02b59426f6c8c3726b5333723fd7a987c..c474415c8b39fc6301be2393f62001d3f2a407e0 100644 (file)
--- 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 d2a6e4583aea0b66906413d02270e497e2c45d27..08eee67f5fb3b93f54b70a869583e1d2de601c52 100644 (file)
--- 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 16d0eb0fdaa3643f8b251aaeb9cbff10b4075d4b..01bd9a16e584ebe48722ba2e12c2f7f02eafb7d5 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 */
+/**/
+    1785,
 /**/
     1784,
 /**/