X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/fca9fb631455f518ae828b36c0fe355a3c8c0665..2cb02ac8d550b1335c547bc59d2af249c3c08e1f:/mr?ds=sidebyside diff --git a/mr b/mr index 0bf6655..7224a04 100755 --- a/mr +++ b/mr @@ -1037,6 +1037,12 @@ sub loadconfig { } } $section=expandenv($section) if $trusted; + if ($section ne 'ALIAS' && + ! exists $config{$dir}{$section} && + exists $config{$dir}{DEFAULT}) { + # copy in defaults + $config{$dir}{$section}={ %{$config{$dir}{DEFAULT}} }; + } } elsif (/^(\w+)\s*=\s*(.*)/) { my $parameter=$1; @@ -1073,12 +1079,6 @@ sub loadconfig { if (! defined $section) { die "$f line $.: parameter ($parameter) not in section\n"; } - if ($section ne 'ALIAS' && - ! exists $config{$dir}{$section} && - exists $config{$dir}{DEFAULT}) { - # copy in defaults - $config{$dir}{$section}={ %{$config{$dir}{DEFAULT}} }; - } if ($section eq 'ALIAS') { $alias{$parameter}=$value; }