Merge commit 'upstream/master' into pub/po

Conflicts:

	debian/changelog
	debian/control

Signed-off-by: intrigeri <intrigeri@boum.org>

1 files changed, 10 insertions, 1 deletions

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 4cf6fa1ff..64408f489 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 53;
+use Test::More tests => 54;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -20,6 +20,15 @@ ok(! pagespec_match("foo", "* and !foo"));
 ok(! pagespec_match("foo", "foo and !foo"));
 ok(! pagespec_match("foo.png", "* and !*.*"));
 ok(pagespec_match("foo", "(bar or ((meep and foo) or (baz or foo) or beep))"));
+ok(pagespec_match("foo", "(
+	bar
+	or (
+		(meep and foo)
+		or
+		(baz or foo)
+		or beep
+	)
+)"), "multiline complex pagespec");
 ok(! pagespec_match("a/foo", "foo", location => "a/b"), "nonrelative fail");
 ok(! pagespec_match("foo", "./*", location => "a/b"), "relative fail");
 ok(pagespec_match("a/foo", "./*", location => "a/b"), "relative");