Skip to content
Permalink
Browse files

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.
  • Loading branch information...
schmonz committed May 27, 2019
1 parent f421309 commit 4d06df9583e6c4145f8c6fc2fd51d7894c0b85ce
Showing with 3 additions and 3 deletions.
  1. +3 −3 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}=

0 comments on commit 4d06df9

Please sign in to comment.
You can’t perform that action at this time.