diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2001-04-08 20:07:11 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-04-08 20:07:11 +0000 |
| commit | dbd1b0a240e81742f12d4fa9574cf883a061b223 (patch) | |
| tree | ccc7af4dc05447067d96e9789d0d6389574c4d58 /lib | |
| parent | 35ef589f8a1ef7477ab32439f10c2e24fb7e16c2 (diff) | |
| download | perl-dbd1b0a240e81742f12d4fa9574cf883a061b223.tar.gz | |
Integrate change #9624 from maintperl into mainline:
the pod tests were not okay. (t/pod/find.t changes ignored)
p4raw-link: @9624 on //depot/maint-5.6/perl: cf1c4a97376b5a495969381e18662a86af89c73a
p4raw-id: //depot/perl@9643
p4raw-integrated: from //depot/maint-5.6/perl@9642 'copy in'
t/pod/emptycmd.t t/pod/for.t t/pod/headings.t t/pod/include.t
t/pod/included.t t/pod/lref.t t/pod/multiline_items.t
t/pod/nested_items.t t/pod/nested_seqs.t t/pod/oneline_cmds.t
t/pod/pod2usage.t t/pod/poderrs.t t/pod/podselect.t (@7885..)
t/pod/special_seqs.t (@7893..) 'merge in' lib/Pod/Find.pm
(@8727..)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Pod/Find.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Pod/Find.pm b/lib/Pod/Find.pm index 759cd3d1b9..6e5f5708bd 100644 --- a/lib/Pod/Find.pm +++ b/lib/Pod/Find.pm @@ -145,7 +145,7 @@ sub pod_find # * remove e.g. 5.00503 # * remove pod/ if followed by *.pod (e.g. in pod/perlfunc.pod) $SIMPLIFY_RX = - qq!^(?i:site_perl/|\Q$Config::Config{archname}\E/|\\d+\\.\\d+([_.]?\\d+)?/|pod/(?=.*?\\.pod\\z))*!; + qq!^(?i:site(_perl)?/|\Q$Config::Config{archname}\E/|\\d+\\.\\d+([_.]?\\d+)?/|pod/(?=.*?\\.pod\\z))*!; } @@ -262,7 +262,7 @@ sub _simplify { # strip Perl's own extensions $_[0] =~ s/\.(pod|pm|plx?)\z//i; # strip meaningless extensions on Win32 and OS/2 - $_[0] =~ s/\.(bat|exe|cmd)\z//i if($^O =~ /win|os2/i); + $_[0] =~ s/\.(bat|exe|cmd)\z//i if($^O =~ /mswin|os2/i); # strip meaningless extensions on VMS $_[0] =~ s/\.(com)\z//i if($^O eq 'VMS'); } |