Merge commit 'remotes/smcv/ready/remove-pagespec-merge'

diff --combined IkiWiki.pm
index 871170992e21389e04c5adcfd5651ebb2533e1e6,06a0b7a2c07ce5874c9e01229719958dc24e63f0..5563a03af7d028a88c184d8f2ac227284c475f52
--- 1/IkiWiki.pm
--- 2/IkiWiki.pm
+++ b/IkiWiki.pm
@@@ -1738,6 -1738,15 +1738,6 @@@ sub add_depends ($$) 
        my $page=shift;
        my $pagespec=shift;
  
 -      if (ref $pagespec eq 'ARRAY') {
 -              foreach my $ps (@$pagespec) {
 -                      if (pagespec_valid($ps)) {
 -                              $depends{$page}{$ps} = 1;
 -                      }
 -              }
 -              return;
 -      }
 -
        return unless pagespec_valid($pagespec);
  
        $depends{$page}{$pagespec} = 1;
@@@ -1824,14 -1833,6 +1824,6 @@@ sub add_link ($$) 
                unless grep { $_ eq $link } @{$links{$page}};
  }
  
- sub pagespec_merge ($$) {
-       my $a=shift;
-       my $b=shift;
- 
-       return $a if $a eq $b;
-       return "($a) or ($b)";
- }
- 
  sub pagespec_translate ($) {
        my $spec=shift;