Integrate:

[ 23738]
Happy new year

[ 23746]
Update copyright years.

[ 23789]
Update copyright years. Add an editor block while passing by.

[ 23803]
Correct the editor block to match the perl 5 policy on tabs
p4raw-link: @23803 on //depot/perl: edf815fd8adfc467da9836baf8369da56521c606
p4raw-link: @23789 on //depot/perl: 241d1a3bc2de8fb12dfbcb48afd9660bc9218a12
p4raw-link: @23746 on //depot/perl: cbdf9ef8fc9cf46a2005685f012ebfff6f0e974a
p4raw-link: @23738 on //depot/perl: 755db5d606be076ff7c6dcb6af89e15fb080c85e

p4raw-id: //depot/maint-5.8/perl@23830
p4raw-integrated: from //depot/perl@23829 'copy in' README (@22890..)
	perlio.c (@23732..) 'edit in' pp_sys.c (@23789..) pp_pack.c
	(@23794..) pp_hot.c pp_sort.c (@23795..) 'merge in'
	miniperlmain.c (@23507..) pp.c (@23795..)
p4raw-integrated: from //depot/perl@23789 'edit in' universal.c
	(@23772..) pp_ctl.c scope.c (@23780..) sv.c (@23781..) 'merge
	in' regcomp.c (@23772..)
p4raw-integrated: from //depot/perl@23746 'merge in' op.c (@23725..)
	mg.c (@23741..) xsutils.c (@23745..)

1 files changed, 11 insertions, 1 deletions

diff --git a/scope.c b/scope.c
index a95c753ef1..6b239bcfeb 100644
--- a/scope.c
+++ b/scope.c
@@ -1,7 +1,7 @@
 /*    scope.c
  *
  *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- *    2000, 2001, 2002, 2003, 2004, by Larry Wall and others
+ *    2000, 2001, 2002, 2003, 2004, 2005, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -1164,3 +1164,13 @@ Perl_cx_dump(pTHX_ PERL_CONTEXT *cx)
     }
 #endif	/* DEBUGGING */
 }
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vim: shiftwidth=4:
+*/