Mercurial > vim

changeset 26059:c7e09c069ece v8.2.3563

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3563: build failure with +eval but without GUI or +termguicolors Commit: https://github.com/vim/vim/commit/2a52196b78f3fcc0e9fad538984272c5fd8d85db Author: Bram Moolenaar <Bram@vim.org> Date: Mon Oct 25 10:30:14 2021 +0100 patch 8.2.3563: build failure with +eval but without GUI or +termguicolors Problem: Build failure with +eval but without GUI or +termguicolors Solution: Adjust #ifdef. (John Marriott)
author Bram Moolenaar <Bram@vim.org>
date Mon, 25 Oct 2021 11:45:04 +0200
parents 3663569f891b
children b392baba0478
files src/highlight.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/highlight.c
+++ b/src/highlight.c
@@ -475,7 +475,7 @@ load_colors(char_u *name)
     buf = alloc(STRLEN(name) + 12);
     if (buf != NULL)
     {
-#ifdef FEAT_EVAL
+#if defined(FEAT_EVAL) && (defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS))
 	load_default_colors_lists();
 #endif
 	apply_autocmds(EVENT_COLORSCHEMEPRE, name,
@@ -2286,7 +2286,7 @@ decode_hex_color(char_u *hex)
     return gui_adjust_rgb(color);
 }
 
-#if defined(FEAT_EVAL)
+#ifdef FEAT_EVAL
 // Returns the color currently mapped to the given name or INVALCOLOR if no
 // such name exists in the color table. The convention is to use lowercase for
 // all keys in the v:colornames dictionary. The value can be either a string in
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3563,
+/**/
     3562,
 /**/
     3561,