* Change yet again how unhandled and escaped preprocessor directives are

  re-output onto the page. Hopefully I finally got it right..

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7c35ce2b5598a6ad40f8e290337309c9782e87fb..37c73cb9fa48ce3716b93576005b3b5c2a3b2fcf 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -626,7 +626,7 @@ sub preprocess ($$$;$$) { #{{{
                my $command=shift;
                my $params=shift;
                if (length $escape) {
-                       return "\\[[$command $params]]";
+                       return "[[$command $params]]";
                }
                elsif (exists $hooks{preprocess}{$command}) {
                        return "" if $scan && ! $hooks{preprocess}{$command}{scan};
@@ -687,7 +687,7 @@ sub preprocess ($$$;$$) { #{{{
                        return $ret;
                }
                else {
-                       return "\\[[$command $params]]";
+                       return "[[$command $params]]";
                }
        };
        

diff --git a/debian/changelog b/debian/changelog
index aa470507eb4fbd2febed19f7f313818ac46b3b27..0605e119198ce32a6943cf98e73ac0c02ba1c937 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,8 +25,10 @@ ikiwiki (2.6) UNRELEASED; urgency=low
   * Fix --libdir to work at the command line.
   * Plugins can now be written as standalone external programs, which can
     be written in any language that can do XML RPC.
+  * Change yet again how unhandled and escaped preprocessor directives are
+    re-output onto the page. Hopefully I finally got it right..
 
- -- Joey Hess <joeyh@debian.org>  Sun, 12 Aug 2007 20:49:23 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 13 Aug 2007 13:34:29 -0400
 
 ikiwiki (2.5) unstable; urgency=low
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index b4a3b70ec46ffc681a60aaf2c43a45f9169b2aa5..48efd64e5811c7af4330ab406d43bed9d2835556 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-12 22:57-0400\n"
+"POT-Creation-Date: 2007-08-13 13:33-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"