diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-07-19 12:36:01 +0200 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-07-19 12:36:01 +0200 |
| commit | ec965fc92cd41f597c6e8e88584b9a688407c8c6 (patch) | |
| tree | 410173c14f66ae62a6436ea00b73bb470c9d1dda /IkiWiki/Plugin/highlight.pm | |
| parent | 86edd73d169600875a10a635ef8df4a644545b0d (diff) | |
| parent | fa2c3a3dba2a4589b63cf445ec9e33ec19be627e (diff) | |
Merge branch 'master' into po
Conflicts:
debian/changelog
Diffstat (limited to 'IkiWiki/Plugin/highlight.pm')
| -rw-r--r-- | IkiWiki/Plugin/highlight.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index 20f79ef57..9bdde85ae 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -4,6 +4,7 @@ package IkiWiki::Plugin::highlight; use warnings; use strict; use IkiWiki 3.00; +use Encode; # locations of highlight's files my $filetypes="/etc/highlight/filetypes.conf"; @@ -69,7 +70,7 @@ sub htmlizefallback { return; } - return highlight($langfile, shift); + return Encode::decode_utf8(highlight($langfile, shift)); } my %ext2lang; |