more D/F conflict tests

diff --git a/utf8.c b/utf8.c
index 5c18f0c28107c91d9b2ec124ea2896d20945aa58..7ddff23fa77fbadf7723bca03d24ad5b8f2baca2 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -298,6 +298,36 @@ static void print_spaces(struct strbuf *buf, int count)
        strbuf_write(buf, s, count);
 }
 
+static void strbuf_add_indented_text(struct strbuf *buf, const char *text,
+                                    int indent, int indent2)
+{
+       if (indent < 0)
+               indent = 0;
+       while (*text) {
+               const char *eol = strchrnul(text, '\n');
+               if (*eol == '\n')
+                       eol++;
+               print_spaces(buf, indent);
+               strbuf_write(buf, text, eol - text);
+               text = eol;
+               indent = indent2;
+       }
+}
+
+static size_t display_mode_esc_sequence_len(const char *s)
+{
+       const char *p = s;
+       if (*p++ != '\033')
+               return 0;
+       if (*p++ != '[')
+               return 0;
+       while (isdigit(*p) || *p == ';')
+               p++;
+       if (*p++ != 'm')
+               return 0;
+       return p - s;
+}
+
 /*
  * Wrap the text, if necessary. The variable indent is the indent for the
  * first line, indent2 is the indent for all other lines.
@@ -311,15 +341,7 @@ int strbuf_add_wrapped_text(struct strbuf *buf,
        const char *bol = text, *space = NULL;
 
        if (width <= 0) {
-               /* just indent */
-               while (*text) {
-                       const char *eol = strchrnul(text, '\n');
-                       if (*eol == '\n')
-                               eol++;
-                       print_spaces(buf, indent);
-                       strbuf_write(buf, text, eol-text);
-                       text = eol;
-               }
+               strbuf_add_indented_text(buf, text, indent, indent2);
                return 1;
        }
 
@@ -329,7 +351,13 @@ int strbuf_add_wrapped_text(struct strbuf *buf,
        }
 
        for (;;) {
-               char c = *text;
+               char c;
+               size_t skip;
+
+               while ((skip = display_mode_esc_sequence_len(text)))
+                       text += skip;
+
+               c = *text;
                if (!c || isspace(c)) {
                        if (w < width || !space) {
                                const char *start = bol;