From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id D76332141E for ; Tue, 5 Feb 2019 11:10:54 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 4/6] hlmod: do_hl* performs src_escape immediately Date: Tue, 5 Feb 2019 11:10:51 +0000 Message-Id: <20190205111053.7155-5-e@80x24.org> In-Reply-To: <20190205111053.7155-1-e@80x24.org> References: <20190205111053.7155-1-e@80x24.org> List-Id: We want to be able to take advantage of this in other modules --- lib/PublicInbox/HlMod.pm | 2 ++ lib/PublicInbox/ViewVCS.pm | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/HlMod.pm b/lib/PublicInbox/HlMod.pm index 13f27d1..014d82f 100644 --- a/lib/PublicInbox/HlMod.pm +++ b/lib/PublicInbox/HlMod.pm @@ -16,6 +16,7 @@ package PublicInbox::HlMod; use strict; use warnings; use highlight; # SWIG-generated stuff +use PublicInbox::Hval qw(src_escape); my $hl; sub _parse_filetypes ($) { @@ -122,6 +123,7 @@ sub do_hl_lang { # know that, so ensure it's marked as UTF-8 even if it isnt... my $out = $gen->generateString($$str); utf8::decode($out); + src_escape($out); \$out; } diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm index 0fb6b64..f6a7694 100644 --- a/lib/PublicInbox/ViewVCS.pm +++ b/lib/PublicInbox/ViewVCS.pm @@ -19,7 +19,7 @@ use warnings; use PublicInbox::SolverGit; use PublicInbox::WwwStream; use PublicInbox::Linkify; -use PublicInbox::Hval qw(ascii_html to_filename src_escape); +use PublicInbox::Hval qw(ascii_html to_filename); my $hl = eval { require PublicInbox::HlMod; PublicInbox::HlMod->new; @@ -123,7 +123,6 @@ sub solve_result { $l->linkify_1($$blob); my $ok = $hl->do_hl($blob, $path) if $hl; if ($ok) { - src_escape($$ok); $blob = $ok; } else { $$blob = ascii_html($$blob); -- EW