To: vim_dev@googlegroups.com Subject: Patch 8.0.1785 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1785 (after 8.0.1783) Problem: Missing symbol in Win32 small build. Solution: Define VTERM_ANSI_INDEX_NONE without the terminal feature. Also fix unused function with #ifdef. Files: src/term.c, src/os_win32.c *** ../vim-8.0.1784/src/term.c 2018-05-01 15:47:30.300975408 +0200 --- src/term.c 2018-05-01 17:27:08.077627762 +0200 *************** *** 6977,6982 **** --- 6977,6984 ---- # 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] = { *** ../vim-8.0.1784/src/os_win32.c 2018-05-01 15:47:30.296975434 +0200 --- src/os_win32.c 2018-05-01 17:29:10.864825498 +0200 *************** *** 7656,7661 **** --- 7656,7662 ---- vtp_printf((char *)buf); } + # ifdef FEAT_TERMGUICOLORS static int ctermtoxterm( int cterm) *************** *** 7665,7670 **** --- 7666,7672 ---- cterm_color2rgb(cterm, &r, &g, &b, &idx); return (((int)r << 16) | ((int)g << 8) | (int)b); } + # endif static void set_console_color_rgb(void) *** ../vim-8.0.1784/src/version.c 2018-05-01 16:26:43.262095812 +0200 --- src/version.c 2018-05-01 17:28:12.385207580 +0200 *************** *** 763,764 **** --- 763,766 ---- { /* Add new patch number below this line */ + /**/ + 1785, /**/ -- FATHER: Did you kill all those guards? LAUNCELOT: Yes ... I'm very sorry ... FATHER: They cost fifty pounds each! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///