X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiViewText.pm;h=53555467d12301dbba583415d4b2ef637e506ab9;hb=d7a5ce3154df5c883255382dfb74bba1b0349b00;hp=c469d1ea5b1ce77a084b1e19a952cb90797054d4;hpb=a80fd0c8e19464f95dec5a5c2d128a1614f51ee5;p=public-inbox.git diff --git a/lib/PublicInbox/LeiViewText.pm b/lib/PublicInbox/LeiViewText.pm index c469d1ea..53555467 100644 --- a/lib/PublicInbox/LeiViewText.pm +++ b/lib/PublicInbox/LeiViewText.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # 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; @@ -243,7 +243,7 @@ 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); my $diff = ($s =~ /^--- [^\n]+\n\+{3} [^\n]+\n@@ /ms); my @sections = PublicInbox::MsgIter::split_quotes($s);