summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Setup/Standard.pm18
1 files changed, 13 insertions, 5 deletions
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index c99dbb620..bdf52f25a 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -90,16 +90,24 @@ sub gendump ($) {
# disable logging to syslog while dumping
$config{syslog}=undef;
- my $curr_section;
+ eval q{use Text::Wrap};
+ die $@ if $@;
+
+ my %section_plugins;
push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
foreach my $pair (IkiWiki::Setup::getsetup()) {
my $plugin=$pair->[0];
my $setup=$pair->[1];
my %s=@{$setup};
my $section=$s{plugin}->{section};
- if (! defined $curr_section || $curr_section ne $section) {
- $curr_section=$section;
- push @ret, "", "\t#", "\t# $section plugins", "\t#";
+ push @{$section_plugins{$section}}, $plugin;
+ if (@{$section_plugins{$section}} == 1) {
+ push @ret, "", "\t#", "\t# $section plugins",
+ sub {
+ wrap("\t# (", "\t# ",
+ join(", ", @{$section_plugins{$section}})).")"
+ },
+ "\t#";
}
my @values=dumpvalues(\%setup, @{$setup});
@@ -119,7 +127,7 @@ sub gendump ($) {
"use IkiWiki::Setup::Standard {";
push @ret, "}";
- return @ret;
+ return map { ref $_ ? $_->() : $_ } @ret;
}
1