--- moin-1.6.3/MoinMoin/macro/Include.py	2008-02-20 06:46:33.000000000 +0900
+++ pkg/x86_64/lib/python2.4/site-packages/MoinMoin/macro/Include.py	2008-05-26 13:54:28.965396000 +0900
@@ -32,9 +32,10 @@
 _arg_skipitems = r'(,\s*skipitems=(?P<skipitems>\d+))?'
 _arg_titlesonly = r'(,\s*(?P<titlesonly>titlesonly))?'
 _arg_editlink = r'(,\s*(?P<editlink>editlink))?'
-_args_re_pattern = r'^(?P<name>[^,]+)(%s(%s)?%s%s%s%s%s%s%s)?$' % (
+_arg_ignorenotfound = r'(,\s*(?P<ignorenotfound>ignorenotfound))?'
+_args_re_pattern = r'^(?P<name>[^,]+)(%s(%s)?%s%s%s%s%s%s%s%s)?$' % (
     _arg_heading, _arg_level, _arg_from, _arg_to, _arg_sort, _arg_items,
-    _arg_skipitems, _arg_titlesonly, _arg_editlink)
+    _arg_skipitems, _arg_titlesonly, _arg_editlink, _arg_ignorenotfound)
 
 _title_re = r"^(?P<heading>\s*(?P<hmarker>=+)\s.*\s(?P=hmarker))$"
 
@@ -95,6 +96,7 @@
         skipitems = int(args.group("skipitems"))
     titlesonly = args.group('titlesonly')
     editlink = args.group('editlink')
+    ignorenotfound = args.group('ignorenotfound')
 
     # iterate over pages
     for inc_name in pagelist:
@@ -127,7 +129,11 @@
             if from_match:
                 from_pos = from_match.end()
             else:
-                result.append(_sysmsg % ('warning', 'Include: ' + _('Nothing found for "%s"!', formatted=False)) % from_re)
+                if ignorenotfound:
+                    continue
+                else:
+                    result.append(_sysmsg % ('warning', 'Include: ' + _('Nothing found for "%s"!', formatted=False)) % from_re)
+
         to_re = args.group('to')
         if to_re:
             try:
@@ -137,7 +143,10 @@
             if to_match:
                 to_pos = to_match.start()
             else:
-                result.append(_sysmsg % ('warning', 'Include: ' + _('Nothing found for "%s"!', formatted=False)) % to_re)
+                if ignorenotfound:
+                    continue
+                else:
+                    result.append(_sysmsg % ('warning', 'Include: ' + _('Nothing found for "%s"!', formatted=False)) % to_re)
 
         if titlesonly:
             levelstack = []
--- moin-1.6.3/MoinMoin/macro/TableOfContents.py	2008-03-29 06:15:00.000000000 +0900
+++ pkg/x86_64/lib/python2.4/site-packages/MoinMoin/macro/TableOfContents.py	2008-05-26 13:51:35.058413000 +0900
@@ -24,9 +24,10 @@
 _arg_skipitems = r'(,\s*skipitems=(?P<skipitems>\d+))?'
 _arg_titlesonly = r'(,\s*(?P<titlesonly>titlesonly))?'
 _arg_editlink = r'(,\s*(?P<editlink>editlink))?'
-_args_re_pattern = r'^(?P<name>[^,]+)(%s(%s)?%s%s%s%s%s%s%s)?$' % (
+_arg_ignorenotfound = r'(,\s*(?P<ignorenotfound>ignorenotfound))?'
+_args_re_pattern = r'^(?P<name>[^,]+)(%s(%s)?%s%s%s%s%s%s%s%s)?$' % (
     _arg_heading, _arg_level, _arg_from, _arg_to, _arg_sort, _arg_items,
-    _arg_skipitems, _arg_titlesonly, _arg_editlink)
+    _arg_skipitems, _arg_titlesonly, _arg_editlink, _arg_ignorenotfound)
 
 # from Include, too, but with extra htext group around header text
 _title_re = r"^(?P<heading>(?P<hmarker>=+)\s(?P<htext>.*)\s(?P=hmarker))$"
--- moin-1.6.3/wiki/underlay/pages/HelpOnMacros(2f)Include/revisions/00000001	2008-04-21 00:59:24.000000000 +0900
+++ pkg/x86_64/share/moin/underlay/pages/HelpOnMacros(2f)Include/revisions/00000001	2008-05-26 14:45:28.850534000 +0900
@@ -14,7 +14,7 @@
 
 '''Usage:'''
  {{{
-<<Include(pagename, heading, level, from="regex", to="regex", sort=ascending|descending, items=n, skipitems=n, titlesonly, editlink)>>
+<<Include(pagename, heading, level, from="regex", to="regex", sort=ascending|descending, items=n, skipitems=n, titlesonly, editlink, ignorenotfound)>>
 }}}
 
  pagename:: Name of the page to include, if it starts with a caret "`^`", a regex of pages to include.
@@ -27,6 +27,7 @@
  skipitems:: Number of initial pages to skip over (optional).
  titlesonly:: Only include a link to the page, not page content (optional).
  editlink:: add a footer with links to the included page, both normal and edit (optional).
+ ignorenotfound:: don't include pages that fail to match `from` or `to` regexes (optional).
  
 All parameters except pagename are optional, but you have to follow the given order! If you want to omit "`heading`", you have to leave the second parameter empty.