Merge tag '2.74' into curl-smtp

Version 2.74 RELEASED.

1 files changed, 0 insertions, 7 deletions

diff --git a/format.c b/format.c
index 755aeb2..b2b585d 100644
--- a/format.c
+++ b/format.c
@@ -94,7 +94,6 @@ static xs_str *format_line(const char *line, xs_list **attach)
             "`[^`]+`"                           "|"
             "~~[^~]+~~"                         "|"
             "\\*\\*?\\*?[^\\*]+\\*?\\*?\\*"     "|"
-            "_[^_]+_"                           "|" //anzu
             "__[^_]+__"                         "|" //anzu
             "!\\[[^]]+\\]\\([^\\)]+\\)"         "|"
             "\\[[^]]+\\]\\([^\\)]+\\)"          "|"
@@ -138,12 +137,6 @@ static xs_str *format_line(const char *line, xs_list **attach)
                 xs *s2 = xs_fmt("<u>%s</u>", s1);
                 s = xs_str_cat(s, s2);
             }
-            else
-            if (xs_startswith(v, "_")) {
-                xs *s1 = xs_strip_chars_i(xs_dup(v), "_");
-                xs *s2 = xs_fmt("<i>%s</i>", s1);
-                s = xs_str_cat(s, s2);
-            }
             //anzu - end
             else
             if (xs_startswith(v, "~~")) {