* Support pagespec "functions" with no parameters, like included() in the

  conditional plugin.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0af4a4fe9303f292977294a8de5ec88d5ddf7d24..d5a641526b91ad3aff6efb48ae832c151fc1fb9d 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1041,7 +1041,7 @@ sub pagespec_translate ($) { #{{{
                |
                        \)              # )
                |
-                       \w+\([^\)]+\)   # command(params)
+                       \w+\([^\)]*\)   # command(params)
                |
                        [^\s()]+        # any other text
                )

diff --git a/debian/changelog b/debian/changelog
index 470a3ece5c4d0623899d21d25c981b7f8694b8ef..c6725a4a29bbae5b7586ef3db0390962b8a3e122 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,10 @@ ikiwiki (2.6) UNRELEASED; urgency=low
     atom feeds, and also changing the publication time for a feed to the
     newest modiciation time (was newest creation time).
   * The patch also adds dcterms:creator to rss items that have a known author.
+  * Support pagespec "functions" with no parameters, like included() in the
+    conditional plugin.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 11 Aug 2007 18:25:28 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 11 Aug 2007 19:26:14 -0400
 
 ikiwiki (2.5) unstable; urgency=low
 

diff --git a/doc/bugs/pagespec_parsing_chokes_on_function__40____41__.mdwn b/doc/bugs/pagespec_parsing_chokes_on_function__40____41__.mdwn
index b7379e7b424568c420fc399a2aea9ef9887f9469..a2eba694cfe9682cc975e3247d1cb0e36c262047 100644 (file)
--- a/doc/bugs/pagespec_parsing_chokes_on_function__40____41__.mdwn
+++ b/doc/bugs/pagespec_parsing_chokes_on_function__40____41__.mdwn
@@ -55,4 +55,10 @@ case the user is given to rebuilding the wiki by hand. --Ethan
        return IkiWiki::FailReason->new("syntax error") if $@;
        return $ret;
  } #}}}
-</pre>
\ No newline at end of file
+</pre>
+
+> Thanks, [[done]] --[[Joey]]
+>
+> Note that the printing of the error isn't needed though. pagespec_match()
+> returns an IkiWiki::FailReason object if parsing fails, and its caller
+> can use that as desired to print the error.