From: Eric Wong <e@80x24.org>
Date: Mon, 2 May 2022 09:04:02 +0000 (+0000)
Subject: lei_view_text: remove all CR before LF
X-Git-Tag: v1.9.0~126
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=d7a5ce3154df5c883255382dfb74bba1b0349b00

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)
---

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 <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
@@ -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);