patch 8.0.1358: undercurl is not used in the terminal
Problem: Undercurl is not used in the terminal. (Kovid Goyal)
Solution: Only fall back to underline when undercurl highlighting is not
defined. (closes #1306)
diff --git a/src/screen.c b/src/screen.c
index 05853d4..4d277e3 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -8058,8 +8058,11 @@
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 */
+ 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,7 +8180,15 @@
else
out_str(T_SE);
}
- if (screen_attr & (HL_UNDERLINE | HL_UNDERCURL))
+ 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;