To: vim_dev@googlegroups.com Subject: Patch 8.0.1358 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1358 Problem: Undercurl is not used in the terminal. (Kovid Goyal) Solution: Only fall back to underline when undercurl highlighting is not defined. (closes #1306) Files: src/screen.c *** ../vim-8.0.1357/src/screen.c 2017-10-28 14:45:12.889429780 +0200 --- src/screen.c 2017-11-28 21:23:15.923806418 +0100 *************** *** 8058,8065 **** out_str(T_ME); if ((attr & HL_STANDOUT) && T_SO != NULL) /* standout */ out_str(T_SO); ! if ((attr & (HL_UNDERLINE | HL_UNDERCURL)) && T_US != NULL) ! /* underline or undercurl */ out_str(T_US); if ((attr & HL_ITALIC) && T_CZH != NULL) /* italic */ out_str(T_CZH); --- 8058,8068 ---- out_str(T_ME); if ((attr & HL_STANDOUT) && T_SO != NULL) /* standout */ out_str(T_SO); ! if ((attr & HL_UNDERCURL) && T_UCS != NULL) /* undercurl */ ! out_str(T_UCS); ! if (((attr & HL_UNDERLINE) /* underline or undercurl */ ! || ((attr & HL_UNDERCURL) && T_UCS == NULL)) ! && T_US != NULL) out_str(T_US); if ((attr & HL_ITALIC) && T_CZH != NULL) /* italic */ out_str(T_CZH); *************** *** 8177,8183 **** else out_str(T_SE); } ! if (screen_attr & (HL_UNDERLINE | HL_UNDERCURL)) { if (STRCMP(T_UE, T_ME) == 0) do_ME = TRUE; --- 8180,8194 ---- else out_str(T_SE); } ! if ((screen_attr & HL_UNDERCURL) && T_UCE != NULL) ! { ! if (STRCMP(T_UCE, T_ME) == 0) ! do_ME = TRUE; ! else ! out_str(T_UCE); ! } ! if ((screen_attr & HL_UNDERLINE) ! || ((screen_attr & HL_UNDERCURL) && T_UCE == NULL)) { if (STRCMP(T_UE, T_ME) == 0) do_ME = TRUE; *** ../vim-8.0.1357/src/version.c 2017-11-28 21:06:14.884880574 +0100 --- src/version.c 2017-11-28 21:19:11.621102616 +0100 *************** *** 773,774 **** --- 773,776 ---- { /* Add new patch number below this line */ + /**/ + 1358, /**/ -- hundred-and-one symptoms of being an internet addict: 52. You ask a plumber how much it would cost to replace the chair in front of your computer with a toilet. /// 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 ///