lei_view_text: remove all CR before LF

[public-inbox.git] / lib / PublicInbox / LeiViewText.pm

diff --git a/lib/PublicInbox/LeiViewText.pm b/lib/PublicInbox/LeiViewText.pm
index 3461271191bce865a4e8c48d1d2e6a495fa8f558..53555467d12301dbba583415d4b2ef637e506ab9 100644 (file)
--- a/lib/PublicInbox/LeiViewText.pm
+++ b/lib/PublicInbox/LeiViewText.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # PublicInbox::Eml to (optionally colorized) text coverter for terminals
@@ -77,7 +77,7 @@ sub new {
        my $cfg = PublicInbox::Config::config_fh_parse($r, "\0", "\n");
        waitpid($pid, 0);
        if ($?) {
-               $lei->err("# git-config failed, no color (non-fatal)");
+               warn "# git-config failed, no color (non-fatal)\n";
                return $self;
        }
        $self->{-colored} = \&my_colored;
@@ -96,10 +96,11 @@ sub quote_hdr_buf ($$) {
        for my $f (qw(To Cc)) {
                for my $v ($eml->header_raw($f)) {
                        next if $v !~ /\S/;
-                       $cc .= $v;
+                       $cc .= ", $v";
                        $to //= $v;
                }
        }
+       substr($cc, 0, 2, ''); # s/^, //;
        PublicInbox::View::fold_addresses($to);
        PublicInbox::View::fold_addresses($cc);
        _xs($to);
@@ -242,9 +243,8 @@ sub add_text_buf { # callback for Eml->each_part
        my ($s, $err) = msg_part_text($part, $ct);
        return attach_note($self, $ct, $p, $fn) unless defined $s;
        hdr_buf($self, $part) if $part->{is_submsg};
-       $s =~ s/\r\n/\n/sg;
+       $s =~ s/\r+\n/\n/sg;
        _xs($s);
-       $s .= "\n" unless substr($s, -1, 1) eq "\n";
        my $diff = ($s =~ /^--- [^\n]+\n\+{3} [^\n]+\n@@ /ms);
        my @sections = PublicInbox::MsgIter::split_quotes($s);
        undef $s; # free memory