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.
Perl · Mar 23, 2015 · abec5be · abec5be
1 parent 5390239
commit abec5be
Show file tree

Hide file tree

Showing 107 changed files with 43 additions and 539 deletions.
diff --git a/.dir-locals.el 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))))
diff --git a/MANIFEST b/MANIFEST
@@ -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
@@ -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
@@ -235,9 +235,4 @@ END
 
 =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
@@ -103,9 +103,4 @@
 
 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
@@ -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
@@ -225,9 +225,4 @@ sub do_unix {
 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:
diff --git a/XSUB.h b/XSUB.h
@@ -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:
  */
diff --git a/av.c b/av.c
@@ -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:
  */
diff --git a/av.h b/av.h
@@ -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:
  */
diff --git a/caretx.c b/caretx.c
@@ -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:
  */
diff --git a/cop.h b/cop.h
@@ -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
@@ -0,0 +1,2 @@
+;; Empty file to avoid imposing the defaults from the parent directory
+;; on code imported from CPAN
diff --git a/cv.h b/cv.h
@@ -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:
  */
diff --git a/deb.c b/deb.c
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);

diff --git a/doio.c b/doio.c
@@ -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:
  */
diff --git a/doop.c b/doop.c
@@ -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:
  */
diff --git a/dosish.h b/dosish.h
@@ -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
@@ -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:
  */
diff --git a/dump.c b/dump.c
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:
  */
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		;; Empty file to avoid imposing the defaults from the parent directory
		;; on code imported from CPAN