urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch up to highlight 3.51 API change. 

As of 3.51, searchFile() is no longer provided in highlight's Perl
bindings (at least on NetBSD and OS X, as built from pkgsrc). This
leaves us falling through to getConfDir(), which has been gone
rather longer.

From highlight git, it appears searchFile() and getFiletypesConfPath()
both originated in the 3.14 release. The latter is still available in
3.51, and returns the same result searchFile() used to. Switch to it.
master
Amitai Schleier 2019-05-26 23:45:10 -04:00
parent f4213094b2
commit 4d06df9583
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IkiWiki/Plugin/highlight.pm
View File

@ -62,10 +62,10 @@ sub checkconfig () {
if (! exists $config{filetypes_conf}) { if (! exists $config{filetypes_conf}) {
if (! $data_dir ) { if (! $data_dir ) {
$config{filetypes_conf}= "/etc/highlight/filetypes.conf"; $config{filetypes_conf}= "/etc/highlight/filetypes.conf";
} elsif ( $data_dir -> can('searchFile') ) { } elsif ( $data_dir -> can('getFiletypesConfPath') ) {
# 3.18 + # 3.14 +
$config{filetypes_conf}= $config{filetypes_conf}=
$data_dir -> searchFile("filetypes.conf"); $data_dir -> getFiletypesConfPath("filetypes");
} else { } else {
# 3.9 + # 3.9 +
$config{filetypes_conf}= $config{filetypes_conf}=