diff options
| author | Dagfinn Ilmari Mannsåker <ilmari@ilmari.org> | 2015-03-18 01:37:04 +0100 |
|---|---|---|
| committer | James E Keenan <jkeenan@cpan.org> | 2015-03-22 22:36:14 -0400 |
| commit | abec5bedacd77b2152e61ec3216ab47bd7272fc9 (patch) | |
| tree | 2ce39dbf6dd78d6043ee1d52e283f1aaff106c1e | |
| parent | 539023973b95d208601bd10848496eae785dcacc (diff) | |
| download | perl-abec5bedacd77b2152e61ec3216ab47bd7272fc9.tar.gz | |
Replace common Emacs file-local variables with dir-locals
An empty cpan/.dir-locals.el stops Emacs using the core defaults for
code imported from CPAN.
Committer's work:
To keep t/porting/cmp_version.t and t/porting/utils.t happy, $VERSION needed
to be incremented in many files, including throughout dist/PathTools.
perldelta entry for module updates.
Add two Emacs control files to MANIFEST; re-sort MANIFEST.
For: RT #124119.
107 files changed, 43 insertions, 539 deletions
diff --git a/.dir-locals.el b/.dir-locals.el new file mode 100644 index 0000000000..9e118b6f96 --- /dev/null +++ b/.dir-locals.el @@ -0,0 +1,5 @@ +;; Default settings for all except cpan/ +((nil . ((indent-tabs-mode . nil))) ; all modes + (cperl-mode . ((cperl-indent-level 4))) + (c-mode . ((c-indentation-style . bsd) + (c-basic-offset . 4)))) @@ -785,6 +785,7 @@ cpan/Digest/t/digest.t See if Digest extensions work cpan/Digest/t/file.t See if Digest extensions work cpan/Digest/t/lib/Digest/Dummy.pm See if Digest extensions work cpan/Digest/t/security.t See if Digest extensions work +cpan/.dir-locals.el Emacs control file cpan/Encode/bin/enc2xs Encode module generator cpan/Encode/bin/encguess guess character encodings of files cpan/Encode/bin/piconv iconv by perl @@ -2852,6 +2853,7 @@ Cross/warp Cross-compilation cv.h Code value header cygwin/cygwin.c Additional code for Cygwin port deb.c Debugging routines +.dir-locals.el Emacs control file dist/Attribute-Handlers/Changes Attribute::Handlers dist/Attribute-Handlers/demo/demo2.pl Attribute::Handlers demo dist/Attribute-Handlers/demo/demo3.pl Attribute::Handlers demo diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl index 174ea5ce56..383f9996e1 100755 --- a/Porting/bisect-runner.pl +++ b/Porting/bisect-runner.pl @@ -3495,9 +3495,4 @@ sub apply_fixups { } } -# Local variables: -# cperl-indent-level: 4 -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: diff --git a/Porting/bisect.pl b/Porting/bisect.pl index 6a51f6782d..6e52a4c359 100755 --- a/Porting/bisect.pl +++ b/Porting/bisect.pl @@ -235,9 +235,4 @@ Documentation for this is in bisect-runner.pl =cut -# Local variables: -# cperl-indent-level: 4 -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: diff --git a/Porting/new-perldelta.pl b/Porting/new-perldelta.pl index bc11e59e5f..09b778333b 100644 --- a/Porting/new-perldelta.pl +++ b/Porting/new-perldelta.pl @@ -103,9 +103,4 @@ git_add_modified(map {chomp $_; $_} `$^X Porting/pod_rules.pl --showfiles`); notify_success(); -# Local variables: -# cperl-indent-level: 4 -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: diff --git a/Porting/pod_lib.pl b/Porting/pod_lib.pl index 3088d16d05..6eaacde48c 100644 --- a/Porting/pod_lib.pl +++ b/Porting/pod_lib.pl @@ -665,9 +665,4 @@ sub get_pod_metadata { 1; -# Local variables: -# cperl-indent-level: 4 -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: diff --git a/Porting/pod_rules.pl b/Porting/pod_rules.pl index 1de43a9092..016a4c56df 100644 --- a/Porting/pod_rules.pl +++ b/Porting/pod_rules.pl @@ -225,9 +225,4 @@ pod/$_: pod/$state->{copies}{$_} process($_, $Build{$_}, main->can("do_$_"), $Test && ++$test, $Verbose) foreach sort keys %Build; -# Local variables: -# cperl-indent-level: 4 -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: @@ -714,11 +714,5 @@ Rethrows a previously caught exception. See L<perlguts/"Exception Handling">. #endif /* _INC_PERL_XSUB_H */ /* include guard */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -1022,11 +1022,5 @@ Perl_av_iter_p(pTHX_ AV *av) { } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -96,11 +96,5 @@ Perl equivalent: C<my @array;>. #define newAV() MUTABLE_AV(newSV_type(SVt_PVAV)) /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -135,11 +135,5 @@ Perl_set_caret_X(pTHX) { } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -1266,11 +1266,5 @@ See L<perlcall/LIGHTWEIGHT CALLBACKS>. multicall_cop = CvSTART(cv); \ } STMT_END /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/cpan/.dir-locals.el b/cpan/.dir-locals.el new file mode 100644 index 0000000000..13109d155e --- /dev/null +++ b/cpan/.dir-locals.el @@ -0,0 +1,2 @@ +;; Empty file to avoid imposing the defaults from the parent directory +;; on code imported from CPAN @@ -310,11 +310,5 @@ typedef OP *(*Perl_call_checker)(pTHX_ OP *, GV *, SV *); #endif /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -326,11 +326,5 @@ Perl_deb_stack_all(pTHX) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/dist/PathTools/Cwd.pm b/dist/PathTools/Cwd.pm index fd24b6e4ad..49cc4c1b39 100644 --- a/dist/PathTools/Cwd.pm +++ b/dist/PathTools/Cwd.pm @@ -3,7 +3,7 @@ use strict; use Exporter; use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION); -$VERSION = '3.55'; +$VERSION = '3.56'; my $xs_version = $VERSION; $VERSION =~ tr/_//; diff --git a/dist/PathTools/Cwd.xs b/dist/PathTools/Cwd.xs index 7206260e1f..9d4dcf0acc 100644 --- a/dist/PathTools/Cwd.xs +++ b/dist/PathTools/Cwd.xs @@ -1,10 +1,4 @@ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/dist/PathTools/lib/File/Spec.pm b/dist/PathTools/lib/File/Spec.pm index 688ea0024e..8c77c986e3 100644 --- a/dist/PathTools/lib/File/Spec.pm +++ b/dist/PathTools/lib/File/Spec.pm @@ -3,7 +3,7 @@ package File::Spec; use strict; use vars qw(@ISA $VERSION); -$VERSION = '3.55'; +$VERSION = '3.56'; $VERSION =~ tr/_//; my %module = (MacOS => 'Mac', diff --git a/dist/PathTools/lib/File/Spec/Cygwin.pm b/dist/PathTools/lib/File/Spec/Cygwin.pm index ab917c5ef6..1b77e6adbd 100644 --- a/dist/PathTools/lib/File/Spec/Cygwin.pm +++ b/dist/PathTools/lib/File/Spec/Cygwin.pm @@ -4,7 +4,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.55'; +$VERSION = '3.56'; $VERSION =~ tr/_//; @ISA = qw(File::Spec::Unix); diff --git a/dist/PathTools/lib/File/Spec/Epoc.pm b/dist/PathTools/lib/File/Spec/Epoc.pm index 8c3b64c2f3..7bc386768e 100644 --- a/dist/PathTools/lib/File/Spec/Epoc.pm +++ b/dist/PathTools/lib/File/Spec/Epoc.pm @@ -3,7 +3,7 @@ package File::Spec::Epoc; use strict; use vars qw($VERSION @ISA); -$VERSION = '3.55'; +$VERSION = '3.56'; $VERSION =~ tr/_//; require File::Spec::Unix; diff --git a/dist/PathTools/lib/File/Spec/Functions.pm b/dist/PathTools/lib/File/Spec/Functions.pm index 1ded427d91..8eafe2483b 100644 --- a/dist/PathTools/lib/File/Spec/Functions.pm +++ b/dist/PathTools/lib/File/Spec/Functions.pm @@ -5,7 +5,7 @@ use strict; use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION); -$VERSION = '3.55'; +$VERSION = '3.56'; $VERSION =~ tr/_//; require Exporter; diff --git a/dist/PathTools/lib/File/Spec/Mac.pm b/dist/PathTools/lib/File/Spec/Mac.pm index 2b0935b9c0..02cae14b74 100644 --- a/dist/PathTools/lib/File/Spec/Mac.pm +++ b/dist/PathTools/lib/File/Spec/Mac.pm @@ -4,7 +4,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.55'; +$VERSION = '3.56'; $VERSION =~ tr/_//; @ISA = qw(File::Spec::Unix); diff --git a/dist/PathTools/lib/File/Spec/OS2.pm b/dist/PathTools/lib/File/Spec/OS2.pm index 92d95f710f..fb8f101692 100644 --- a/dist/PathTools/lib/File/Spec/OS2.pm +++ b/dist/PathTools/lib/File/Spec/OS2.pm @@ -4,7 +4,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.55'; +$VERSION = '3.56'; $VERSION =~ tr/_//; @ISA = qw(File::Spec::Unix); diff --git a/dist/PathTools/lib/File/Spec/Unix.pm b/dist/PathTools/lib/File/Spec/Unix.pm index 98a232de9b..f76b29e356 100644 --- a/dist/PathTools/lib/File/Spec/Unix.pm +++ b/dist/PathTools/lib/File/Spec/Unix.pm @@ -3,7 +3,7 @@ package File::Spec::Unix; use strict; use vars qw($VERSION); -$VERSION = '3.55'; +$VERSION = '3.56'; my $xs_version = $VERSION; $VERSION =~ tr/_//; diff --git a/dist/PathTools/lib/File/Spec/VMS.pm b/dist/PathTools/lib/File/Spec/VMS.pm index d74c0be3e2..254f5248cd 100644 --- a/dist/PathTools/lib/File/Spec/VMS.pm +++ b/dist/PathTools/lib/File/Spec/VMS.pm @@ -4,7 +4,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.55'; +$VERSION = '3.56'; $VERSION =~ tr/_//; @ISA = qw(File::Spec::Unix); diff --git a/dist/PathTools/lib/File/Spec/Win32.pm b/dist/PathTools/lib/File/Spec/Win32.pm index bbaf0e3caf..53f3854cd7 100644 --- a/dist/PathTools/lib/File/Spec/Win32.pm +++ b/dist/PathTools/lib/File/Spec/Win32.pm @@ -5,7 +5,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.55'; +$VERSION = '3.56'; $VERSION =~ tr/_//; @ISA = qw(File::Spec::Unix); @@ -2583,11 +2583,5 @@ Perl_vms_start_glob } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -1276,11 +1276,5 @@ Perl_do_kv(pTHX) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -184,11 +184,5 @@ #define PERL_NO_DEV_RANDOM /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/dquote_static.c b/dquote_static.c index 801240bcf6..885ba06ffb 100644 --- a/dquote_static.c +++ b/dquote_static.c @@ -344,11 +344,5 @@ S_form_short_octal_warning(pTHX_ } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -2599,11 +2599,5 @@ Perl_debprofdump(pTHX) /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm b/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm index 8dd0f28889..61c66df7ed 100644 --- a/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm +++ b/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm @@ -8,7 +8,7 @@ use vars qw($VERSION @ISA @EXPORT); @ISA = qw(Exporter); @EXPORT = qw(writemain); -$VERSION = '1.04'; +$VERSION = '1.05'; # blead will run this with miniperl, hence we can't use autodie or File::Temp my $temp; @@ -249,10 +249,4 @@ L<ExtUtils::MakeMaker> =cut -# Local variables: -# c-indentation-style: bsd -# c-basic-offset: 4 -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: diff --git a/ext/PerlIO-mmap/mmap.pm b/ext/PerlIO-mmap/mmap.pm index 0f666d27fc..845f2d1de8 100644 --- a/ext/PerlIO-mmap/mmap.pm +++ b/ext/PerlIO-mmap/mmap.pm @@ -1,7 +1,7 @@ package PerlIO::mmap; use strict; use warnings; -our $VERSION = '0.013'; +our $VERSION = '0.014'; use XSLoader; XSLoader::load(__PACKAGE__, __PACKAGE__->VERSION); diff --git a/ext/PerlIO-mmap/mmap.xs b/ext/PerlIO-mmap/mmap.xs index 6632544c76..e6d592a67d 100644 --- a/ext/PerlIO-mmap/mmap.xs +++ b/ext/PerlIO-mmap/mmap.xs @@ -1,10 +1,4 @@ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/ext/XS-APItest/core_or_not.inc b/ext/XS-APItest/core_or_not.inc index 9c1cf561d5..412074a28f 100644 --- a/ext/XS-APItest/core_or_not.inc +++ b/ext/XS-APItest/core_or_not.inc @@ -35,9 +35,6 @@ CAT2(sv_setsv_cow_hashkey_, SUFFIX) () { /* * Local variables: * mode: c - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil * End: * * ex: set ts=8 sts=4 sw=4 et: diff --git a/ext/attributes/attributes.pm b/ext/attributes/attributes.pm index 74cfc6380d..f7af31b7b4 100644 --- a/ext/attributes/attributes.pm +++ b/ext/attributes/attributes.pm @@ -1,6 +1,6 @@ package attributes; -our $VERSION = 0.26; +our $VERSION = 0.27; @EXPORT_OK = qw(get reftype); @EXPORT = (); diff --git a/ext/attributes/attributes.xs b/ext/attributes/attributes.xs index 9c9ec11f94..d98fd9e3ec 100644 --- a/ext/attributes/attributes.xs +++ b/ext/attributes/attributes.xs @@ -249,11 +249,5 @@ usage: XSRETURN(1); /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/ext/re/re_top.h b/ext/re/re_top.h index e73550f9a8..ce4c716aa5 100644 --- a/ext/re/re_top.h +++ b/ext/re/re_top.h @@ -33,11 +33,5 @@ #define PERL_NO_GET_CONTEXT /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/fakesdio.h b/fakesdio.h index 094fd006c3..928d37b90a 100644 --- a/fakesdio.h +++ b/fakesdio.h @@ -123,11 +123,5 @@ #define fgets(s,n,f) _CANNOT _fgets_ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -34,11 +34,5 @@ #include "perlapi.h" /* bring in PL_force_link_funcs */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -3606,11 +3606,5 @@ core_xsub(pTHX_ CV* cv) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -289,11 +289,5 @@ Return the CV from the GV. #define gv_SVadd(gv) gv_add_by_type((gv), SVt_NULL) /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -2137,11 +2137,5 @@ void Perl_mem_log_del_sv(const SV *sv, const char *filename, const int linenumbe #endif /* HANDY_H */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -3698,11 +3698,5 @@ Perl_hv_assert(pTHX_ HV *hv) #endif /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -629,11 +629,5 @@ Creates a new HV. The reference count is set to 1. #include "hv_func.h" /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -700,11 +700,5 @@ S_perl_hash_murmur_hash_64b (const unsigned char * const seed, const unsigned ch #endif /*compile once*/ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -402,11 +402,5 @@ S_sv_only_taint_gmagic(SV *sv) { } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/installman b/installman index 66b71616e2..ce4b7f3abc 100755 --- a/installman +++ b/installman @@ -174,9 +174,4 @@ sub pod2man { $packlist->write() unless $opts{notify}; print " Installation complete\n" if $opts{verbose}; -# Local variables: -# cperl-indent-level: 4 -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: diff --git a/installperl b/installperl index 516ae70b63..5c34264fec 100755 --- a/installperl +++ b/installperl @@ -809,9 +809,4 @@ sub strip } } -# Local variables: -# cperl-indent-level: 4 -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: diff --git a/iperlsys.h b/iperlsys.h index 39999b063d..57160e0804 100644 --- a/iperlsys.h +++ b/iperlsys.h @@ -1415,11 +1415,5 @@ struct IPerlSockInfo #endif /* __Inc__IPerl___ */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/lib/File/stat.t b/lib/File/stat.t index 81f75f586c..7c9b9cc340 100644 --- a/lib/File/stat.t +++ b/lib/File/stat.t @@ -186,9 +186,4 @@ SKIP: done_testing; -# Local variables: -# cperl-indent-level: 4 -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: @@ -1753,11 +1753,5 @@ Perl_sync_locale(pTHX) /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -2362,11 +2362,5 @@ Perl_sbrk(int size) #endif /* ! defined USE_PERL_SBRK */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -1820,11 +1820,5 @@ END_EXTERN_C #endif /* NO_MATHOMS */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -3576,11 +3576,5 @@ Perl_magic_getdebugvar(pTHX_ SV *sv, MAGIC *mg) { } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -76,11 +76,5 @@ struct magic { #define whichsig(pv) whichsig_pv(pv) /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/mro_core.c b/mro_core.c index 4da9682c62..25d30d9067 100644 --- a/mro_core.c +++ b/mro_core.c @@ -1419,11 +1419,5 @@ XS(XS_mro_method_changed_in) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/mydtrace.h b/mydtrace.h index 5093f466ab..6e797676fa 100644 --- a/mydtrace.h +++ b/mydtrace.h @@ -91,11 +91,5 @@ #endif /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -130,11 +130,5 @@ struct _FILE; #endif /*not define EBCDIC */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -1638,11 +1638,5 @@ Perl_signbit(NV x) { #endif /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -14486,11 +14486,5 @@ const_av_xsub(pTHX_ CV* cv) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -1045,11 +1045,5 @@ Sets the sibling of o to sib /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -2892,11 +2892,5 @@ Perl_padname_dup(pTHX_ PADNAME *src, CLONE_PARAMS *param) #endif /* USE_ITHREADS */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -515,11 +515,5 @@ of a string/length pair. Perl_pad_findmy_pvn(aTHX_ STR_WITH_LEN(name), flags) /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -149,11 +149,5 @@ enum { }; /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -5074,11 +5074,5 @@ Perl_xs_boot_epilog(pTHX_ const U32 ax) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -6660,11 +6660,5 @@ extern void moncontrol(int); #endif /* Include guard */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/perldtrace.d b/perldtrace.d index 0fdb7ea866..6a9e9de303 100644 --- a/perldtrace.d +++ b/perldtrace.d @@ -16,10 +16,5 @@ provider perl { }; /* - * Local Variables: - * tab-width: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -5234,11 +5234,5 @@ Perl_noperl_die(const char* pat, ...) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -367,11 +367,5 @@ END_EXTERN_C #endif /* _PERLIO_H */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -289,11 +289,5 @@ PERL_EXPORT_C IV PerlIOUtf8_pushed(pTHX_ PerlIO *f, const char *mode, SV #endif /* _PERLIOL_H */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/perlsdio.h b/perlsdio.h index 7dcd394110..cb25577579 100644 --- a/perlsdio.h +++ b/perlsdio.h @@ -139,11 +139,5 @@ END_EXTERN_C #endif /* PERLIO_IS_STDIO */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -577,11 +577,5 @@ Perl_yyparse (pTHX_ int gramtype) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/pod/buildtoc b/pod/buildtoc index cbdec61227..acb8cf62a7 100644 --- a/pod/buildtoc +++ b/pod/buildtoc @@ -275,9 +275,4 @@ sub unitem { $initem = 0; } -# Local variables: -# cperl-indent-level: 4 -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 0577a87f3a..30960e6c93 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -123,6 +123,26 @@ L<Module::CoreList> has been upgraded from version 5.20150320 to 5.20150420. Updated to cover the latest releases of Perl. +=item * + +L<ExtUtils::Miniperl> has been upgraded from version 1.04 to 1.05. + +=item * + +FindExt has been upgraded from version 1.02 to 1.03. + +=item * + +L<Cwd> has been upgraded from version 3.55 to 3.56. + +=item * + +L<PerlIO::mmap> has been upgraded from version 0.013 to 0.014. + +=item * + +L<attributes> has been upgraded from version 0.26 to 0.27. + =back =head2 Removed Modules and Pragmata @@ -6500,11 +6500,5 @@ PP(pp_anonconst) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -528,11 +528,5 @@ True if this op will be the return value of an lvalue subroutine #endif /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -5621,11 +5621,5 @@ S_run_user_filter(pTHX_ int idx, SV *buf_sv, int maxlen) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -3611,11 +3611,5 @@ PP(pp_method_redir_super) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -3106,11 +3106,5 @@ PP(pp_pack) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -2015,11 +2015,5 @@ S_amagic_cmp_locale(pTHX_ SV *const str1, SV *const str2) #endif /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -5728,11 +5728,5 @@ lockf_emulate_flock(int fd, int operation) #endif /* LOCKF_EMULATE_FLOCK */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -18174,11 +18174,5 @@ S_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node, #endif /* DEBUGGING */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -999,11 +999,5 @@ typedef enum { } bound_type; /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -9043,11 +9043,5 @@ S_to_byte_substr(pTHX_ regexp *prog) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -848,11 +848,5 @@ typedef struct regmatch_slab { /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -48,11 +48,5 @@ Perl_runops_standard(pTHX) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -1402,11 +1402,5 @@ Perl_cx_dump(pTHX_ PERL_CONTEXT *cx) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -341,11 +341,5 @@ STMT_START { \ #define save_op() save_pushptr((void *)(PL_op), SAVEt_OP) /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -16226,11 +16226,5 @@ Perl_report_uninit(pTHX_ const SV *uninit_sv) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -2268,11 +2268,5 @@ Evaluates I<sv> more than once. Sets I<len> to 0 if C<SvOOK(sv)> is false. #define SV_CONSTS_COUNT 35 /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/t/op/attrproto.t b/t/op/attrproto.t index 8e69e3382e..464081f29a 100644 --- a/t/op/attrproto.t +++ b/t/op/attrproto.t @@ -132,8 +132,4 @@ is @warnings, 0, "Malformed prototype isn't just a warning"; is @warnings, 0, "No more warnings"; } -# Local variables: -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: diff --git a/t/op/groups.t b/t/op/groups.t index 008aae8450..754690cf1f 100644 --- a/t/op/groups.t +++ b/t/op/groups.t @@ -402,8 +402,4 @@ sub uniq { @_; } -# Local variables: -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: diff --git a/t/porting/FindExt.t b/t/porting/FindExt.t index b3f9c31ae2..32c331e104 100644 --- a/t/porting/FindExt.t +++ b/t/porting/FindExt.t @@ -75,9 +75,4 @@ unless (join (' ', sort split ' ', $Config{extensions}) sort @found_built); } -# Local variables: -# cperl-indent-level: 4 -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: diff --git a/t/porting/utils.t b/t/porting/utils.t index 9842ea27df..475380d416 100644 --- a/t/porting/utils.t +++ b/t/porting/utils.t @@ -87,9 +87,4 @@ foreach my $victim (@victims) { } } -# Local variables: -# cperl-indent-level: 4 -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: @@ -185,11 +185,5 @@ Perl_taint_env(pTHX) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -431,11 +431,5 @@ #endif /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -11737,11 +11737,5 @@ Perl_parse_subsignature(pTHX) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/universal.c b/universal.c index f05f40a775..1b4e5506aa 100644 --- a/universal.c +++ b/universal.c @@ -1124,11 +1124,5 @@ Perl_boot_core_UNIVERSAL(pTHX) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -147,11 +147,5 @@ #endif /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -4208,11 +4208,5 @@ Perl_uvuni_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -674,11 +674,5 @@ machines) is a valid UTF-8 character. #endif /* H_UTF8 */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/utfebcdic.h b/utfebcdic.h index a4f5fb5cb2..edbe6aa699 100644 --- a/utfebcdic.h +++ b/utfebcdic.h @@ -217,11 +217,5 @@ END_EXTERN_C #define MAX_UTF8_TWO_BYTE 0x3FF /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -6493,11 +6493,5 @@ Perl_dump_c_backtrace(pTHX_ PerlIO* fp, int depth, int skip) #endif /* #ifdef USE_C_BACKTRACE */ /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ @@ -230,11 +230,5 @@ means arg not present, 1 is empty string/null byte */ #endif /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */ diff --git a/win32/FindExt.pm b/win32/FindExt.pm index 6e62838254..c0da7ee75b 100644 --- a/win32/FindExt.pm +++ b/win32/FindExt.pm @@ -1,6 +1,6 @@ package FindExt; -our $VERSION = '1.02'; +our $VERSION = '1.03'; use strict; use warnings; @@ -132,9 +132,4 @@ sub scan_ext } 1; -# Local variables: -# cperl-indent-level: 4 -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: diff --git a/write_buildcustomize.pl b/write_buildcustomize.pl index 57a547c562..5d819b5ded 100644 --- a/write_buildcustomize.pl +++ b/write_buildcustomize.pl @@ -101,9 +101,4 @@ unlink $file or warn "Can't unlink $file after error: $!"; die $error; -# Local variables: -# cperl-indent-level: 4 -# indent-tabs-mode: nil -# End: -# # ex: set ts=8 sts=4 sw=4 et: |