From d7a5ce3154df5c883255382dfb74bba1b0349b00 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 2 May 2022 09:04:02 +0000 Subject: [PATCH] lei_view_text: remove all CR before LF This deals with CR-CR-LF messages, matching the HTML change in 7ee3643af9b72cad (view: remove all CR before LF, 2022-02-11) --- lib/PublicInbox/LeiViewText.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/LeiViewText.pm b/lib/PublicInbox/LeiViewText.pm index 2dad3b78..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 @@ -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); -- 2.44.0