[win32] merge another maintpatch to toke.c

	Message-Id: <199711221445.OAA14153@crypt.compulink.co.uk>
	Subject: Re: [PERL] Here-doc in s///e (was: Bug)

p4raw-id: //depot/win32/perl@629

1 files changed, 1 insertions, 2 deletions

diff --git a/toke.c b/toke.c
index 3f90f74720..4fee674121 100644
--- a/toke.c
+++ b/toke.c
@@ -1356,7 +1356,6 @@ filter_read(int idx, SV *buf_sv, int maxlen)
     return (*funcp)(idx, buf_sv, maxlen);
 }
 
-
 static char *
 filter_gets(register SV *sv, register PerlIO *fp, STRLEN append)
 {
@@ -4998,7 +4997,7 @@ scan_heredoc(register char *s)
     register char *d;
     register char *e;
     char *peek;
-    int outer = (rsfp && !lex_inwhat);
+    int outer = (rsfp && !(lex_inwhat == OP_SCALAR));
 
     s += 2;
     d = tokenbuf;