Merge branch 'blead' of ssh://perl5.git.perl.org/gitroot/perl into blead

6 files changed, 17 insertions, 14 deletions

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index f599d81a09..3556014e32 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1335,7 +1335,7 @@ use File::Glob qw(:case);
 			     qr{^inc/Test/},
 			     qw{ mytypemap },
 			   ],
-	'UPSTREAM'	=> undef,
+	'UPSTREAM'	=> 'cpan',
 	},
 
     'SelfLoader' =>
diff --git a/Porting/release_managers_guide.pod b/Porting/release_managers_guide.pod
index dfffe171c4..2697a5ab69 100644
--- a/Porting/release_managers_guide.pod
+++ b/Porting/release_managers_guide.pod
@@ -110,11 +110,11 @@ If you don't have a PAUSE account, then request one:
 
     https://pause.perl.org/pause/query?ACTION=request_id
 
-Check that your account is allowed to upload perl distros: goto
-L<https://pause.perl.org/>, login, then select 'upload file to CPAN'; there
-should be a "For pumpkings only: Send a CC" tickbox.  If not, ask Andreas
-KE<0xf6>nig to add your ID to the list of people allowed to upload something
-called perl.  You can find Andreas' email address at:
+Check that your account is allowed to upload perl distros: go to
+L<https://pause.perl.org/pause/authenquery?ACTION=who_pumpkin> and check that
+your PAUSE ID is listed there.  If not, ask Andreas KE<0xf6>nig to add your ID
+to the list of people allowed to upload something called perl.  You can find
+Andreas' email address at:
 
     https://pause.perl.org/pause/query?ACTION=pause_04imprint
 
diff --git a/installperl b/installperl
index f29f8e512f..73448df4d8 100755
--- a/installperl
+++ b/installperl
@@ -722,7 +722,7 @@ sub installlib {
     if ( $dir =~ /^unicore/ ) {
       if ( $name =~ /\.txt\z/ ) {
         # We can ignore most, but not all .txt files
-        return unless $name =~ /\A(?:UnicodeData|Blocks|Scripts|CompositionExclusions|CaseFolding|SpecialCasing|NamedSequences)\.txt\z/;
+        return unless $name =~ /\A(?:Blocks|CaseFolding|SpecialCasing|NamedSequences)\.txt\z/;
       }
       else {
         # TestProp only needed during testing
diff --git a/pod/perlfaq4.pod b/pod/perlfaq4.pod
index 970100a28e..2e7beb3e25 100644
--- a/pod/perlfaq4.pod
+++ b/pod/perlfaq4.pod
@@ -13,7 +13,7 @@ numbers, dates, strings, arrays, hashes, and miscellaneous data issues.
 
 For the long explanation, see David Goldberg's "What Every Computer
 Scientist Should Know About Floating-Point Arithmetic"
-(http://docs.sun.com/source/806-3568/ncg_goldberg.html).
+(U<http://web.cse.msu.edu/~cse320/Documents/FloatingPoint.pdf>).
 
 Internally, your computer represents floating-point numbers in binary.
 Digital (as in powers of two) computers cannot store all numbers
diff --git a/regcomp.c b/regcomp.c
index b7a69393b2..0581217a9b 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -11134,7 +11134,7 @@ Perl_regprop(pTHX_ const regexp *prog, SV *sv, const regnode *o)
 	if (flags & ANYOF_NONBITMAP_NON_UTF8)
 	    sv_catpvs(sv, "{outside bitmap}");
 
-	{
+	if (ANYOF_NONBITMAP(o)) {
 	    SV *lv;
 	    SV * const sw = regclass_swash(prog, o, FALSE, &lv, 0);
 	
diff --git a/regexec.c b/regexec.c
index 76784ee97f..69ddba5d16 100644
--- a/regexec.c
+++ b/regexec.c
@@ -6432,6 +6432,8 @@ Perl_regclass_swash(pTHX_ const regexp *prog, register const regnode* node, bool
 
     PERL_ARGS_ASSERT_REGCLASS_SWASH;
 
+    assert(ANYOF_NONBITMAP(node));
+
     if (data && data->count) {
 	const U32 n = ARG(node);
 
@@ -6597,11 +6599,12 @@ S_reginclass(pTHX_ const regexp * const prog, register const regnode * const n,
 	if (utf8_target && (flags & ANYOF_UNICODE_ALL) && c >= 256) {
 	    match = TRUE;	/* Everything above 255 matches */
 	}
-	else if ((flags & ANYOF_NONBITMAP_NON_UTF8
-		  || (utf8_target && ANYOF_NONBITMAP(n)
-		      && (c >=256
-			  || (! (flags & ANYOF_LOCALE))
-			  || (flags & ANYOF_IS_SYNTHETIC)))))
+	else if (ANYOF_NONBITMAP(n)
+		 && ((flags & ANYOF_NONBITMAP_NON_UTF8)
+		     || (utf8_target
+		         && (c >=256
+			     || (! (flags & ANYOF_LOCALE))
+			     || (flags & ANYOF_IS_SYNTHETIC)))))
 	{
 	    AV *av;
 	    SV * const sw = regclass_swash(prog, n, TRUE, 0, (SV**)&av);