X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/cf3021ef3f5cb839195585d601de76df519da510..aa04f54ae94461e6e6ef42596824247c9e04ca5f:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 9556d6ef7..5ebec5d0b 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -18,7 +18,6 @@ use vars qw{%config %links %oldlinks %oldpagemtime %pagectime %pagecase
 sub defaultconfig () { #{{{
 	wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.x?html?$|\.rss$)},
 	wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]]+)\]\]/,
-	wiki_processor_regexp => qr/\[\[(\w+)\s+([^\]]*)\]\]/,
 	wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
 	verbose => 0,
 	syslog => 0,
@@ -545,6 +544,8 @@ sub pagespec_merge ($$) { #{{{
 	my $a=shift;
 	my $b=shift;
 
+	return $a if $a eq $b;
+
         # Support for old-style GlobLists.
         if (is_globlist($a)) {
                 $a=globlist_to_pagespec($a);