From: Joey Hess <joey@kitenet.net>
Date: Tue, 26 Oct 2010 03:00:32 +0000 (-0400)
Subject: highlight: Ensure that other, more-specific format plugins, like txt are used in... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5c6eb167b8e69e0607330f06c893a73dfe1c675a;p=ikiwiki.git

highlight: Ensure that other, more-specific format plugins, like txt are used in preference to this one in case of ties.
---

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index 5674f0b4a..872537c72 100644
--- 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 2857ec482..f6ca122a0 100644
--- 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