Integrate:

[ 23861]
Update copyright years and add editor blocks

[ 23941]
With mallocwrap New() evaluates its arguments more than once, so they
had better not have any side effects.
:-(

[ 23943]
Avoid evaluating a strlen twice due the new implementation
of New() with PERL_MALLOC_WRAP

[ 23968]
Use strl* functions in doio.c when available
Based on :
Subject: [PATCH] Changes to doio.c to use strlcpy() and strlcat()
From: Steve Peters <steve@fisharerojo.org>
Date: Wed, 1 Dec 2004 19:42:14 -0600
Message-ID: <20041202014214.GA20907@mccoy.peters.homeunix.org>

[ 24003]
Update -v copyright notice

[ 24032]
gcc warning patch by Andy Lester

[ 24046]
Remove an useless line, spotted by Andy Lester

[ 24058]
Break up long lines in -V output for compile-time options

Subject: Re: sitecustomize.pl [PATCH]
From: sthoenna[at]efn.org (Yitzchak Scott-Thoennes)
Date: Tue, 8 Mar 2005 17:46:04 -0800
Message-ID: <20050309014604.GA5876[at]efn.org>

[ 24102]
USE_STRLCAT and USE_STRLCPY now actually used
LIBM_VERSION_TYPE and USE_SITECUSTOMIZE are preparations
for future use

[ 24106]
Update copyrights.

[ 24108]
Another Win32 compilation clean-up (for when using Perl's malloc)

[ 24121]
Update copyrights.
Well, those are generated files anyway.
p4raw-link: @24121 on //depot/perl: 2419183b5b2616670ccea658b69504ec1babc68d
p4raw-link: @24108 on //depot/perl: 575fbe19638bbb2c64232d56697c4e2bd450b1de
p4raw-link: @24106 on //depot/perl: 1d3259712a05143b33614901d9fae89e4bbfaa3e
p4raw-link: @24102 on //depot/perl: cae3d67c6ac216abcbe9b6832a607768c0fe4ccf
p4raw-link: @24058 on //depot/perl: efcaa95b05d30c10585967bb358126b84bd75b53
p4raw-link: @24046 on //depot/perl: 6176dd9f323ed71666b3090232f3bc20f1d8ec8b
p4raw-link: @24032 on //depot/perl: 22469a62e89c5b688296aee74b9b68348ff12194
p4raw-link: @24003 on //depot/perl: 359b00fe3089c84f6f4b5e7703992d79ccfc9b88
p4raw-link: @23968 on //depot/perl: 0c19750d2627c55b20798d7cb5b4c84a03d8ec71
p4raw-link: @23943 on //depot/perl: fbbafa6d4d20579293b51de798077b9e8c394e94
p4raw-link: @23941 on //depot/perl: 26866f99b421a0fa48720d3ab1c6664d3cde4a59
p4raw-link: @23861 on //depot/perl: af3babe40f275e6db9af8c90e109cc84e4f526b3

p4raw-id: //depot/maint-5.8/perl@24156
p4raw-branched: from //depot/perl@24154 'branch in' regen_perly.pl
	(@23959..)
p4raw-integrated: from //depot/perl@24154 'copy in' perlapi.c
	(@20406..) malloc.c (@23176..) hv.h (@23873..) 'edit in'
	handy.h (@24102..) embedvar.h (@24106..) 'merge in' embed.pl
	(@23568..) thread.h (@23749..) pp.h (@23767..) perlapi.h
	scope.h (@23780..) doop.c (@23857..) op.h (@23983..) XSUB.h
	deb.c regcomp.h (@24074..) numeric.c (@24079..) av.c
	miniperlmain.c thrdvar.h (@24081..) sv.h (@24088..) pad.c
	(@24089..) gv.h (@24095..)
p4raw-integrated: from //depot/perl@24121 'merge in' global.sym
	(@23873..) embed.h (@24094..) proto.h (@24095..)
p4raw-integrated: from //depot/perl@24106 'edit in' perl.h (@24074..)
	'merge in' dump.c (@24088..)
p4raw-integrated: from //depot/perl@24058 'edit in' perl.c (@24049..)
p4raw-integrated: from //depot/perl@24046 'merge in' toke.c (@24042..)
p4raw-integrated: from //depot/perl@23968 'merge in' doio.c (@23725..)
p4raw-integrated: from //depot/perl@23941 'edit in' util.c (@23881..)
p4raw-integrated: from //depot/perl@23861 'merge in' hv.c (@23843..)
	utf8.c (@23857..)

1 files changed, 0 insertions, 1 deletions

diff --git a/toke.c b/toke.c
index 9fc31a22da..1cce1615cb 100644
--- a/toke.c
+++ b/toke.c
@@ -299,7 +299,6 @@ S_missingterm(pTHX_ char *s)
 	) {
 	*tmpbuf = '^';
 	tmpbuf[1] = toCTRL(PL_multi_close);
-	s = "\\n";
 	tmpbuf[2] = '\0';
 	s = tmpbuf;
     }