* Add exclude option in setup files, works same as --exclude.

2 files changed, 5 insertions, 1 deletions

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 56bf17e2c..289b48b87 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -34,7 +34,8 @@ sub preprocess (@) { #{{{
 
 	$tags{$page} = [];
 	foreach my $tag (keys %params) {
-		if (exists $IkiWiki::config{tagbase}) {
+		if (exists $IkiWiki::config{tagbase} &&
+		    defined $IkiWiki::config{tagbase}) {
 			$tag=$IkiWiki::config{tagbase}."/".$tag;
 		}
 		push @{$tags{$page}}, $tag;
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 4082ca7af..b1418ae34 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -30,6 +30,9 @@ sub setup_standard {
 		}
 		delete $setup{disable_plugins};
 	}
+	if (exists $setup{exclude}) {
+		$config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+	}
 
 	debug("generating wrappers..");
 	my @wrappers=@{$setup{wrappers}};