Integrate win32

p4raw-id: //depot/ansiperl@987

diff --cc pod/perlop.pod
index e8818f7,538745d..a634cea
--- 1/pod/perlop.pod
--- 2/pod/perlop.pod
+++ b/pod/perlop.pod
@@@ -1078,6 -1084,6 +1084,15 @@@ If you really mean such values to termi
  tested for explcitly:
  
      while (($_ = <STDIN>) ne '0') { ... }
++    while (<STDIN>) { last unless $_; ... }
++
++In other boolean contexts C<E<lt>I<filehandle>E<gt>> without explcit C<defined>
++test or comparison will solicit a warning if C<-w> is in effect.
++
++If you really mean such values to terminate the loop they should be 
++tested for explcitly:
++
++    while (($_ = <STDIN>) ne '0') { ... }
      while (<STDIN>) { last unless $_; ... }
  
  In other boolean contexts C<E<lt>I<filehandle>E<gt>> without explcit C<defined>

diff --cc pp_hot.c
Simple merge

diff --cc sv.c
Simple merge

diff --cc toke.c
Simple merge

diff --cc utils/perldoc.PL
index 80a721c,326da7a..60983b2
--- 1/utils/perldoc.PL
--- 2/utils/perldoc.PL
+++ b/utils/perldoc.PL
@@@ -48,8 -48,9 +48,9 @@@ if(@ARGV<1) 
        $me = $0;               # Editing $0 is unportable
        $me =~ s,.*/,,;
        die <<EOF;
 -Usage: $me [-h] [-v] [-t] [-u] [-m] [-l] [-F] [-X] PageName|ModuleName|ProgramName
 +Usage: $me [-h] [-r] [-i] [-v] [-t] [-u] [-m] [-l] [-F] [-X] PageName|ModuleName|ProgramName
         $me -f PerlFunc
+        $me -q FAQKeywords
  
  The -h option prints more help.  Also try "perldoc perldoc" to get
  aquainted with the system.
@@@ -110,7 -115,7 +117,7 @@@ use Text::ParseWords
  
  unshift(@ARGV,shellwords($ENV{"PERLDOC"}));
  
- getopts("mhtluvriFf:X") || usage;
 -getopts("mhtluvFf:Xq:") || usage;
++getopts("mhtluvriFf:Xq") || usage;
  
  usage if $opt_h || $opt_h; # avoid -w warning