Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / IkiWiki / Plugin / highlight.pm

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index ce919748a4d10c6308cea7c1ea6559c47c608534..f6908921ed6ec3ca770ffefa2f6e8f11a939d286 100644 (file)
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -201,7 +201,9 @@ sub highlight ($$) {
 
        my $gen;
        if (! exists $highlighters{$langfile}) {
 
        my $gen;
        if (! exists $highlighters{$langfile}) {

+               no warnings 'once';

                $gen = highlight::CodeGenerator::getInstance($highlight::XHTML);
                $gen = highlight::CodeGenerator::getInstance($highlight::XHTML);

+               use warnings;

                $gen->setFragmentCode(1); # generate html fragment
                $gen->setHTMLEnclosePreTag(1); # include stylish <pre>
                if ($data_dir){
                $gen->setFragmentCode(1); # generate html fragment
                $gen->setHTMLEnclosePreTag(1); # include stylish <pre>
                if ($data_dir){