unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 5/5] view: inline flush_quote sub
Date: Sat,  4 Apr 2020 08:03:19 +0000	[thread overview]
Message-ID: <20200404080319.3293-6-e@yhbt.net> (raw)
In-Reply-To: <20200404080319.3293-1-e@yhbt.net>

No point in having an extra sub for a short, commonly
called function in the same file.
---
 lib/PublicInbox/View.pm | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 12ef6431..1e53d8dc 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -482,17 +482,6 @@ sub multipart_text_as_html {
 	msg_iter($_[0], \&add_text_body, $_[1], 1);
 }
 
-sub flush_quote {
-	my ($s, $l, $quot) = @_;
-
-	my $rv = $l->to_html($$quot);
-
-	# we use a <span> here to allow users to specify their own
-	# color for quoted text
-	$$quot = undef;
-	$$s .= qq(<span\nclass="q">) . $rv . '</span>'
-}
-
 sub attach_link ($$$$;$) {
 	my ($ctx, $ct, $p, $fn, $err) = @_;
 	my ($part, $depth, @idx) = @$p;
@@ -587,14 +576,18 @@ sub add_text_body { # callback for msg_iter
 	my $l = $ctx->{-linkify} //= PublicInbox::Linkify->new;
 	foreach my $cur (@sections) {
 		if ($cur =~ /\A>/) {
-			flush_quote($rv, $l, \$cur);
+			# we use a <span> here to allow users to specify
+			# their own color for quoted text
+			$$rv .= qq(<span\nclass="q">);
+			$$rv .= $l->to_html($cur);
+			$$rv .= '</span>';
 		} elsif ($diff) {
 			flush_diff($ctx, \$cur);
 		} else {
 			# regular lines, OK
 			$$rv .= $l->to_html($cur);
-			$cur = undef;
 		}
+		$cur = undef;
 	}
 
 	obfuscate_addrs($ibx, $$rv) if $ibx->{obfuscate};

      parent reply	other threads:[~2020-04-04  8:03 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-04  8:03 [PATCH 0/5] view*: minor cleanups and fixes Eric Wong
2020-04-04  8:03 ` [PATCH 1/5] view: note we assume UTF-8 on unknown encodings Eric Wong
2020-04-04  8:03 ` [PATCH 2/5] view: use defined-or operator to simplify checks Eric Wong
2020-04-04  8:03 ` [PATCH 3/5] view: dedupe_subject: allow "0" is a valid Subject Eric Wong
2020-04-04 23:38   ` Eric Wong
2020-04-04  8:03 ` [PATCH 4/5] viewdiff: reduce sub parameter count Eric Wong
2020-04-04  8:03 ` Eric Wong [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200404080319.3293-6-e@yhbt.net \
    --to=e@yhbt.net \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).