highlight: Ensure that other, more-specific format plugins, like txt are used in...

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index 5674f0b4aa150557fbb75e76e208a284dd145288..872537c726c2f62500e836babc9bccd50a2e95fd 100644 (file)
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -10,8 +10,8 @@ sub import {
        hook(type => "getsetup", id => "highlight",  call => \&getsetup);
        hook(type => "checkconfig", id => "highlight", call => \&checkconfig);
        # this hook is used by the format plugin
-       hook(type => "htmlizeformat", id => "highlight", call =>
-               \&htmlizeformat);
+       hook(type => "htmlizeformat", id => "highlight", 
+               call => \&htmlizeformat, last => 1);
 }
 
 sub getsetup () {
@@ -74,6 +74,7 @@ sub checkconfig () {
                                },
                                longname => sprintf(gettext("Source code: %s"), $file),
                                @opts,
+                               last => 1,
                        );
                }
        }

diff --git a/debian/changelog b/debian/changelog
index 2857ec482e3f593ef6f76809e3354a29f78ca9ab..f6ca122a00520afc7d326a28c62d92a3422581a8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20101024) UNRELEASED; urgency=low
 
   * txt: Fix display when used inside a format directive.
+  * highlight: Ensure that other, more-specific format plugins,
+    like txt are used in preference to this one in case of ties.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2010 22:30:29 -0400