To: vim_dev@googlegroups.com Subject: Patch 8.2.3563 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3563 (after 8.2.3562) Problem: Build failure with +eval but without GUI or +termguicolors Solution: Adjust #ifdef. (John Marriott) Files: src/highlight.c *** ../vim-8.2.3562/src/highlight.c 2021-10-24 20:34:01.430895189 +0100 --- src/highlight.c 2021-10-25 10:25:14.731151733 +0100 *************** *** 475,481 **** buf = alloc(STRLEN(name) + 12); if (buf != NULL) { ! #ifdef FEAT_EVAL load_default_colors_lists(); #endif apply_autocmds(EVENT_COLORSCHEMEPRE, name, --- 475,481 ---- buf = alloc(STRLEN(name) + 12); if (buf != NULL) { ! #if defined(FEAT_EVAL) && (defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS)) load_default_colors_lists(); #endif apply_autocmds(EVENT_COLORSCHEMEPRE, name, *************** *** 2286,2292 **** return gui_adjust_rgb(color); } ! #if defined(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 --- 2286,2292 ---- return gui_adjust_rgb(color); } ! #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 *** ../vim-8.2.3562/src/version.c 2021-10-24 20:34:01.434895238 +0100 --- src/version.c 2021-10-25 10:27:35.697864025 +0100 *************** *** 759,760 **** --- 759,762 ---- { /* Add new patch number below this line */ + /**/ + 3563, /**/ -- "The amigos also appear to be guilty of not citing the work of others who had gone before them. Even worse, they have a chapter about modeling time and space without making a single reference to Star Trek!" (Scott Ambler, reviewing the UML User Guide) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///