X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/82f0facb620e59594aaf318c2eaf676c7788f1e6..f41448d9caf591ba369bf319297d15552be94678:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d96964a23..9d4732b6f 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -10,7 +10,7 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
-	$IkiWiki::Setup::raw_setup=$_[1];
+	IkiWiki::Setup::merge($_[1]);
 } #}}}
 
 sub dumpline ($$$$) { #{{{
@@ -74,6 +74,9 @@ sub dumpvalues ($@) { #{{{
 		elsif (exists $info{example}) {
 			push @ret, dumpline($key, $info{example}, $info{type}, "#");
 		}
+		else {
+			push @ret, dumpline($key, "", $info{type}, "#");
+		}
 	}
 	return @ret;
 } #}}}
@@ -83,26 +86,30 @@ sub gendump ($) { #{{{
 	my %setup=(%config);
 	my @ret;
 	
+	# disable logging to syslog while dumping
+	$config{syslog}=0;
+
 	push @ret, "\t# basic setup";
 	push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
 
 	# Load all plugins, so that all setup options are available.
-	my @plugins=grep { ! /externaldemo|pythondemo/ } sort(IkiWiki::listplugins());
+	# (But skip a few problematic external demo plugins.)
+	my @plugins=grep { ! /^(externaldemo|pythondemo|\Q$config{rcs}\E)$/ }
+		sort(IkiWiki::listplugins());
+	unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st
 	foreach my $plugin (@plugins) {
 		eval { IkiWiki::loadplugin($plugin) };
 		if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) {
 			my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
 		}
 	}
-	unshift @plugins, $config{rcs} if $config{rcs};
 
 	foreach my $id (@plugins) {
-		my $title="\t# $id".($id ne $config{rcs} ? " plugin" : "");
 		if (exists $IkiWiki::hooks{getsetup}{$id}{call}) {
 			# use an array rather than a hash, to preserve order
 			my @s=eval { $IkiWiki::hooks{getsetup}{$id}{call}->() };
 			next unless @s;
-			push @ret, "", $title;
+			push @ret, "", "\t# $id plugin";
 			push @ret, dumpvalues(\%setup, @s);
 		}
 	}