2 files changed, 6 insertions, 5 deletions

diff --git a/src/ui/text.c b/src/ui/text.c
index 977cac9c..4a4b3776 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -1871,7 +1871,7 @@ iInt2 tryAdvance_Text(int fontId, iRangecc text, int width, const char **endPos)
 }
 
 iInt2 tryAdvanceNoWrap_Text(int fontId, iRangecc text, int width, const char **endPos) {
-    if (width <= 1) {
+    if (width && width <= 1) {
         *endPos = text.start;
         return zero_I2();
     }
@@ -2070,7 +2070,7 @@ iTextMetrics draw_WrapText(iWrapText *d, int fontId, iInt2 pos, int color) {
         const int width = d->mode == word_WrapTextMode
                               ? tryAdvance_Text(fontId, text, d->maxWidth, &endPos).x
                               : tryAdvanceNoWrap_Text(fontId, text, d->maxWidth, &endPos).x;
-        notify_WrapText_(d, endPos, (iTextAttrib){ .colorId = color }, 0, width);
+        notify_WrapText_(d, endPos, (iTextAttrib){ .fgColorId = color }, 0, width);
         drawRange_Text(fontId, pos, color, (iRangecc){ text.start, endPos });
         text.start = endPos;
         pos.y += lineHeight_Text(fontId);
diff --git a/src/ui/text_simple.c b/src/ui/text_simple.c
index 81fb94a5..8560c138 100644
--- a/src/ui/text_simple.c
+++ b/src/ui/text_simple.c
@@ -61,7 +61,7 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
        and other non-complex LTR scripts. Composed glyphs are not supported (must rely on text
        being in a pre-composed form). This algorithm is used if HarfBuzz is not available. */
     const iInt2 orig        = args->pos;
-    iTextAttrib attrib      = { .colorId = args->color };
+    iTextAttrib attrib      = { .fgColorId = args->color };
     iRect       bounds      = { orig, init_I2(0, d->height) };
     float       xpos        = orig.x;
     float       xposMax     = xpos;
@@ -118,8 +118,9 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
             if (match_RegExp(activeText_->ansiEscape, chPos, args->text.end - chPos, &m)) {
                 if (mode & draw_RunMode && ~mode & permanentColorFlag_RunMode) {
                     /* Change the color. */
-                    const iColor clr =
-                        ansiForeground_Color(capturedRange_RegExpMatch(&m, 1), tmParagraph_ColorId);
+                    iColor clr;
+                    ansiColors_Color(capturedRange_RegExpMatch(&m, 1), tmParagraph_ColorId,
+                                     none_ColorId, &clr, NULL);
                     SDL_SetTextureColorMod(activeText_->cache, clr.r, clr.g, clr.b);
                     if (args->mode & fillBackground_RunMode) {
                         SDL_SetRenderDrawColor(activeText_->render, clr.r, clr.g, clr.b, 0);