various small tweaks (still fails a few taint tests in {taint,locale}.t)

p4raw-id: //depot/perl@1309

4 files changed, 6 insertions, 2 deletions

diff --git a/Todo.5.005 b/Todo.5.005
index bea5d84749..37ee13937d 100644
--- a/Todo.5.005
+++ b/Todo.5.005
@@ -63,3 +63,5 @@ Documentation
     document Win32 choices
     rework INSTALL to reflect changes in installation structure
     spot-check all new modules for completeness
+    better docs for pack()/unpack()
+    add perlport.pod
diff --git a/lib/re.pm b/lib/re.pm
index 07626c2123..ff38c41286 100644
--- a/lib/re.pm
+++ b/lib/re.pm
@@ -25,7 +25,7 @@ See L<perlmodlib/Pragmatic Modules>.
 =cut
 
 my %bitmask = (
-taint => 0x00001000
+taint => 0x00100000
 );
 
 sub bits {
diff --git a/sv.c b/sv.c
index d4cac52e9a..f60e8206ca 100644
--- a/sv.c
+++ b/sv.c
@@ -3609,7 +3609,7 @@ sv_2mortal(register SV *sv)
     if (!sv)
 	return sv;
     if (SvREADONLY(sv) && SvIMMORTAL(sv))
-	return;
+	return sv;
     if (++tmps_ix >= tmps_max)
 	sv_mortalgrow();
     tmps_stack[tmps_ix] = sv;
diff --git a/t/lib/fields.t b/t/lib/fields.t
index 7fad5d78f2..fe6ed18c1c 100755
--- a/t/lib/fields.t
+++ b/t/lib/fields.t
@@ -6,6 +6,8 @@ use vars qw($DEBUG);
 my $w;
 
 BEGIN {
+   chdir 't' if -d 't';
+   @INC = '../lib' if -d '../lib';
    $SIG{__WARN__} = sub {
        if ($_[0] =~ /^Hides field 'b1' in base class/) {
            $w++;