From 4d06df9583e6c4145f8c6fc2fd51d7894c0b85ce Mon Sep 17 00:00:00 2001 From: Amitai Schleier Date: Sun, 26 May 2019 23:45:10 -0400 Subject: [PATCH] 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. --- IkiWiki/Plugin/highlight.pm | 6 +++--- 1 file 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}=