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.

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index f6908921ed6ec3ca770ffefa2f6e8f11a939d286..04c554ac4e8da12399e5421eb9293d9c8e7eb866 100644 (file)
--- 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";
        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}=
                $config{filetypes_conf}=

-                 $data_dir -> searchFile("filetypes.conf");
+                 $data_dir -> getFiletypesConfPath("filetypes");

              } else {
                # 3.9 +
                $config{filetypes_conf}=
              } else {
                # 3.9 +
                $config{filetypes_conf}=