aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitai Schleier <schmonz-web-ikiwiki@schmonz.com>2019-05-26 23:45:10 -0400
committerAmitai Schleier <schmonz-web-ikiwiki@schmonz.com>2019-05-26 23:45:19 -0400
commit4d06df9583e6c4145f8c6fc2fd51d7894c0b85ce (patch)
treefe10bc4fea674c4950aefb52ca590a42a0777c34
parentf4213094b28081086dbf2710101d241646005e7b (diff)
downloadikiwiki-4d06df9583e6c4145f8c6fc2fd51d7894c0b85ce.tar
ikiwiki-4d06df9583e6c4145f8c6fc2fd51d7894c0b85ce.tar.gz
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.
-rw-r--r--IkiWiki/Plugin/highlight.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index f6908921e..04c554ac4 100644
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -62,10 +62,10 @@ sub checkconfig () {
if (! exists $config{filetypes_conf}) {
if (! $data_dir ) {
$config{filetypes_conf}= "/etc/highlight/filetypes.conf";
- } elsif ( $data_dir -> can('searchFile') ) {
- # 3.18 +
+ } elsif ( $data_dir -> can('getFiletypesConfPath') ) {
+ # 3.14 +
$config{filetypes_conf}=
- $data_dir -> searchFile("filetypes.conf");
+ $data_dir -> getFiletypesConfPath("filetypes");
} else {
# 3.9 +
$config{filetypes_conf}=