To: vim_dev@googlegroups.com Subject: Patch 8.1.2391 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2391 Problem: Cannot build when __QNXNTO__ is defined. (Ian Wayne Larson) Solution: Move the check for "qansi". (Ken Takata, closes #5317) Files: src/highlight.c *** ../vim-8.1.2390/src/highlight.c 2019-11-02 22:54:37.401188829 +0100 --- src/highlight.c 2019-12-05 18:33:11.815751455 +0100 *************** *** 559,568 **** { // t_Co is 8: use the 8 colors table #if defined(__QNXNTO__) ! color = color_numbers_8_qansi[idx]; ! #else ! color = color_numbers_8[idx]; #endif if (foreground) { // set/reset bold attribute to get light foreground --- 559,570 ---- { // t_Co is 8: use the 8 colors table #if defined(__QNXNTO__) ! // On qnx, the 8 & 16 color arrays are the same ! if (STRNCMP(T_NAME, "qansi", 5) == 0) ! color = color_numbers_16[idx]; ! else #endif + color = color_numbers_8[idx]; if (foreground) { // set/reset bold attribute to get light foreground *************** *** 1136,1148 **** { int bold = MAYBE; - #if defined(__QNXNTO__) - static int *color_numbers_8_qansi = color_numbers_8; - // On qnx, the 8 & 16 color arrays are the same - if (STRNCMP(T_NAME, "qansi", 5) == 0) - color_numbers_8_qansi = color_numbers_16; - #endif - // reduce calls to STRICMP a bit, it can be slow off = TOUPPER_ASC(*arg); for (i = (sizeof(color_names) / sizeof(char *)); --i >= 0; ) --- 1138,1143 ---- *************** *** 3378,3384 **** * bold-underlined. */ attr = 0; ! for ( ; *p && *p != ','; ++p) // parse upto comma { if (VIM_ISWHITE(*p)) // ignore white space continue; --- 3373,3379 ---- * bold-underlined. */ attr = 0; ! for ( ; *p && *p != ','; ++p) // parse up to comma { if (VIM_ISWHITE(*p)) // ignore white space continue; *** ../vim-8.1.2390/src/version.c 2019-12-05 18:16:28.202179635 +0100 --- src/version.c 2019-12-05 18:34:34.963502193 +0100 *************** *** 744,745 **** --- 744,747 ---- { /* Add new patch number below this line */ + /**/ + 2391, /**/ -- hundred-and-one symptoms of being an internet addict: 193. You ask your girlfriend to drive home so you can sit back with your PDA and download the information to your laptop /// 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 ///