78 files changed, 152 insertions, 152 deletions

diff --git a/XSUB.h b/XSUB.h
index 4e439f17fe..7231600936 100644
--- a/XSUB.h
+++ b/XSUB.h
@@ -657,8 +657,8 @@ Rethrows a previously caught exception.  See L<perlguts/"Exception Handling">.
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/av.c b/av.c
index aada6c6b17..05516688ce 100644
--- a/av.c
+++ b/av.c
@@ -1040,8 +1040,8 @@ Perl_av_iter_p(pTHX_ AV *av) {
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/av.h b/av.h
index 8d18d25af1..35c921fe6f 100644
--- a/av.h
+++ b/av.h
@@ -94,8 +94,8 @@ Perl equivalent: C<my @array;>.
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/cop.h b/cop.h
index 0cfeb44714..dc52807841 100644
--- a/cop.h
+++ b/cop.h
@@ -1249,8 +1249,8 @@ See L<perlcall/LIGHTWEIGHT CALLBACKS>.
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/cv.h b/cv.h
index a3b9865c48..448e20abe2 100644
--- a/cv.h
+++ b/cv.h
@@ -236,8 +236,8 @@ typedef OP *(*Perl_call_checker)(pTHX_ OP *, GV *, SV *);
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/deb.c b/deb.c
index 3664d07c58..838e66444f 100644
--- a/deb.c
+++ b/deb.c
@@ -330,8 +330,8 @@ Perl_deb_stack_all(pTHX)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/doio.c b/doio.c
index a430361eaf..69d091c219 100644
--- a/doio.c
+++ b/doio.c
@@ -2400,8 +2400,8 @@ Perl_vms_start_glob
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/doop.c b/doop.c
index b2b6546d8c..dd6add2bc5 100644
--- a/doop.c
+++ b/doop.c
@@ -1297,8 +1297,8 @@ Perl_do_kv(pTHX)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/dosish.h b/dosish.h
index e9c59fa546..8c3917b510 100644
--- a/dosish.h
+++ b/dosish.h
@@ -204,8 +204,8 @@
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/dquote_static.c b/dquote_static.c
index e23ec4623a..f7f4a4f173 100644
--- a/dquote_static.c
+++ b/dquote_static.c
@@ -168,8 +168,8 @@ S_grok_bslash_o(pTHX_ const char *s,
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/dump.c b/dump.c
index 9f3fb3b044..75ee7e7bae 100644
--- a/dump.c
+++ b/dump.c
@@ -3178,8 +3178,8 @@ Perl_op_xmldump(pTHX_ const OP *o)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/ext/PerlIO-mmap/mmap.pm b/ext/PerlIO-mmap/mmap.pm
index 7db4a55137..cf97882fa5 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.010';
+our $VERSION = '0.011';
 
 use XSLoader;
 XSLoader::load(__PACKAGE__, __PACKAGE__->VERSION);
diff --git a/ext/PerlIO-mmap/mmap.xs b/ext/PerlIO-mmap/mmap.xs
index 3e87d3b371..4c96da84f7 100644
--- a/ext/PerlIO-mmap/mmap.xs
+++ b/ext/PerlIO-mmap/mmap.xs
@@ -2,10 +2,10 @@
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
 
 #define PERL_NO_GET_CONTEXT
diff --git a/ext/XS-APItest/core_or_not.inc b/ext/XS-APItest/core_or_not.inc
index 8fa32349cb..efc7caa74f 100644
--- a/ext/XS-APItest/core_or_not.inc
+++ b/ext/XS-APItest/core_or_not.inc
@@ -37,8 +37,8 @@ CAT2(sv_setsv_cow_hashkey_, SUFFIX) () {
  * mode: c
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/ext/attributes/attributes.pm b/ext/attributes/attributes.pm
index 6bf10ab747..4a359f0e79 100644
--- a/ext/attributes/attributes.pm
+++ b/ext/attributes/attributes.pm
@@ -1,6 +1,6 @@
 package attributes;
 
-our $VERSION = 0.19;
+our $VERSION = 0.20;
 
 @EXPORT_OK = qw(get reftype);
 @EXPORT = ();
diff --git a/ext/attributes/attributes.xs b/ext/attributes/attributes.xs
index e92f793d5c..d39b77a4f4 100644
--- a/ext/attributes/attributes.xs
+++ b/ext/attributes/attributes.xs
@@ -216,8 +216,8 @@ usage:
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/ext/re/re_top.h b/ext/re/re_top.h
index 6eb02e3368..2d26207bd1 100644
--- a/ext/re/re_top.h
+++ b/ext/re/re_top.h
@@ -35,8 +35,8 @@
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/fakesdio.h b/fakesdio.h
index 614438096e..094fd006c3 100644
--- a/fakesdio.h
+++ b/fakesdio.h
@@ -126,8 +126,8 @@
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/fakethr.h b/fakethr.h
index 7c82aa6d69..643806de26 100644
--- a/fakethr.h
+++ b/fakethr.h
@@ -68,8 +68,8 @@ struct thread_intern {
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/globals.c b/globals.c
index df0f9d0763..f53a898423 100644
--- a/globals.c
+++ b/globals.c
@@ -37,8 +37,8 @@
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/gv.c b/gv.c
index 0bfab3f310..d7660f7899 100644
--- a/gv.c
+++ b/gv.c
@@ -3098,8 +3098,8 @@ core_xsub(pTHX_ CV* cv)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/gv.h b/gv.h
index a393262016..0f91d194ab 100644
--- a/gv.h
+++ b/gv.h
@@ -259,8 +259,8 @@ Return the SV from the GV.
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/handy.h b/handy.h
index 281920b324..3782788831 100644
--- a/handy.h
+++ b/handy.h
@@ -1316,8 +1316,8 @@ void Perl_mem_log_del_sv(const SV *sv, const char *filename, const int linenumbe
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/hv.c b/hv.c
index 6b662518f6..ac826f1ff3 100644
--- a/hv.c
+++ b/hv.c
@@ -3513,8 +3513,8 @@ Perl_hv_assert(pTHX_ HV *hv)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/hv.h b/hv.h
index 05245d58a7..77c39d97c7 100644
--- a/hv.h
+++ b/hv.h
@@ -626,8 +626,8 @@ Creates a new HV.  The reference count is set to 1.
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/iperlsys.h b/iperlsys.h
index 0bfad3ce09..b23f4d3eb2 100644
--- a/iperlsys.h
+++ b/iperlsys.h
@@ -1416,8 +1416,8 @@ struct IPerlSockInfo
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/locale.c b/locale.c
index b7a78fbea9..c10228da3e 100644
--- a/locale.c
+++ b/locale.c
@@ -631,8 +631,8 @@ Perl_mem_collxfrm(pTHX_ const char *s, STRLEN len, STRLEN *xlen)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/madly.c b/madly.c
index 11e2e376de..d703732816 100644
--- a/madly.c
+++ b/madly.c
@@ -19,8 +19,8 @@
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/malloc.c b/malloc.c
index 3f24ff22c9..d367d9d792 100644
--- a/malloc.c
+++ b/malloc.c
@@ -2404,8 +2404,8 @@ Perl_sbrk(int size)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/mathoms.c b/mathoms.c
index cd32b9d440..b3c79e85d1 100644
--- a/mathoms.c
+++ b/mathoms.c
@@ -1210,8 +1210,8 @@ END_EXTERN_C
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/mg.c b/mg.c
index e0aea0f44a..855671b1de 100644
--- a/mg.c
+++ b/mg.c
@@ -3403,8 +3403,8 @@ Perl_magic_copycallchecker(pTHX_ SV *sv, MAGIC *mg, SV *nsv,
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/mg.h b/mg.h
index 53ef628751..995bc5eb1a 100644
--- a/mg.h
+++ b/mg.h
@@ -67,8 +67,8 @@ struct magic {
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/miniperlmain.c b/miniperlmain.c
index 260369ee5c..461997c3e5 100644
--- a/miniperlmain.c
+++ b/miniperlmain.c
@@ -169,8 +169,8 @@ xs_init(pTHX)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/mro.c b/mro.c
index 41e34cd6d5..b07683f4a7 100644
--- a/mro.c
+++ b/mro.c
@@ -1422,8 +1422,8 @@ XS(XS_mro_method_changed_in)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/mydtrace.h b/mydtrace.h
index 5a2e35fe7f..1c969ee604 100644
--- a/mydtrace.h
+++ b/mydtrace.h
@@ -64,8 +64,8 @@
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/nostdio.h b/nostdio.h
index f6a13b4998..ef8d6526b4 100644
--- a/nostdio.h
+++ b/nostdio.h
@@ -129,8 +129,8 @@ struct _FILE;
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/numeric.c b/numeric.c
index c00dabd433..cfd75dc169 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1105,8 +1105,8 @@ Perl_signbit(NV x) {
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/op.c b/op.c
index 697769cf34..fb21eb32ef 100644
--- a/op.c
+++ b/op.c
@@ -10840,8 +10840,8 @@ const_sv_xsub(pTHX_ CV* cv)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/op.h b/op.h
index b6bbd4c828..6aa16f5725 100644
--- a/op.h
+++ b/op.h
@@ -1021,8 +1021,8 @@ struct token {
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/pad.c b/pad.c
index 3b8cac2203..6901b83c15 100644
--- a/pad.c
+++ b/pad.c
@@ -2250,8 +2250,8 @@ Perl_padlist_dup(pTHX_ AV *srcpad, CLONE_PARAMS *param)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/pad.h b/pad.h
index aa6521ff9b..139cb0699b 100644
--- a/pad.h
+++ b/pad.h
@@ -378,8 +378,8 @@ of a string/length pair.
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/parser.h b/parser.h
index 1e9c71d3ce..967e8724df 100644
--- a/parser.h
+++ b/parser.h
@@ -149,8 +149,8 @@ enum {
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/perl.c b/perl.c
index afb94e84e2..44987d3211 100644
--- a/perl.c
+++ b/perl.c
@@ -4980,8 +4980,8 @@ read_e_script(pTHX_ int idx, SV *buf_sv, int maxlen)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/perl.h b/perl.h
index 548f471f64..3d89f8a867 100644
--- a/perl.h
+++ b/perl.h
@@ -5828,8 +5828,8 @@ extern void moncontrol(int);
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/perldtrace.d b/perldtrace.d
index 95eb0664da..8c051f6c86 100644
--- a/perldtrace.d
+++ b/perldtrace.d
@@ -16,5 +16,5 @@ provider perl {
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/perlio.c b/perlio.c
index 7dac9be33b..a593c486c7 100644
--- a/perlio.c
+++ b/perlio.c
@@ -5220,8 +5220,8 @@ PerlIO_sprintf(char *s, int n, const char *fmt, ...)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/perlio.h b/perlio.h
index 0575cb17bd..78a52f321d 100644
--- a/perlio.h
+++ b/perlio.h
@@ -392,8 +392,8 @@ END_EXTERN_C
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/perliol.h b/perliol.h
index 3bce866f49..c667f1f5eb 100644
--- a/perliol.h
+++ b/perliol.h
@@ -279,8 +279,8 @@ PERL_EXPORT_C IV        PerlIOUtf8_pushed(pTHX_ PerlIO *f, const char *mode, SV
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/perlsdio.h b/perlsdio.h
index 691ee32571..29e817617a 100644
--- a/perlsdio.h
+++ b/perlsdio.h
@@ -157,8 +157,8 @@
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/perlsfio.h b/perlsfio.h
index 2471753ad1..66ec10fdbd 100644
--- a/perlsfio.h
+++ b/perlsfio.h
@@ -77,8 +77,8 @@ extern int	_stdprintf _ARG_((const char*, ...));
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/perly.c b/perly.c
index 13c729dbba..a01b562350 100644
--- a/perly.c
+++ b/perly.c
@@ -724,8 +724,8 @@ Perl_yyparse (pTHX_ int gramtype)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/pp.c b/pp.c
index 4858d99265..5107c2767a 100644
--- a/pp.c
+++ b/pp.c
@@ -6054,8 +6054,8 @@ PP(pp_runcv)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/pp.h b/pp.h
index 539dd130b2..deafed36b8 100644
--- a/pp.h
+++ b/pp.h
@@ -511,8 +511,8 @@ True if this op will be the return value of an lvalue subroutine
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/pp_ctl.c b/pp_ctl.c
index 34fe99028d..271dfb2e5d 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -5668,8 +5668,8 @@ S_path_is_absolute(const char *name)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/pp_hot.c b/pp_hot.c
index 1a5b76c7d7..692bf470e2 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -3062,8 +3062,8 @@ S_method_common(pTHX_ SV* meth, U32* hashp)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/pp_pack.c b/pp_pack.c
index 9f1c83a34b..909eb45f59 100644
--- a/pp_pack.c
+++ b/pp_pack.c
@@ -3637,8 +3637,8 @@ PP(pp_pack)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/pp_sort.c b/pp_sort.c
index 364a6a013e..813cd2cfeb 100644
--- a/pp_sort.c
+++ b/pp_sort.c
@@ -2005,8 +2005,8 @@ S_amagic_cmp_locale(pTHX_ register SV *const str1, register SV *const str2)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/pp_sys.c b/pp_sys.c
index 65d527a56c..5a87da5051 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -5663,8 +5663,8 @@ lockf_emulate_flock(int fd, int operation)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/regcomp.c b/regcomp.c
index 9f239ff0f4..403d5b2bff 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -13445,8 +13445,8 @@ S_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node,
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/regcomp.h b/regcomp.h
index e1e9fdb22b..0fdb0058b8 100644
--- a/regcomp.h
+++ b/regcomp.h
@@ -881,8 +881,8 @@ re.pm, especially to the documentation.
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/regexec.c b/regexec.c
index 8650654934..288108dced 100644
--- a/regexec.c
+++ b/regexec.c
@@ -7113,8 +7113,8 @@ S_to_byte_substr(pTHX_ register regexp *prog)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/regexp.h b/regexp.h
index 78fec5781a..db432015af 100644
--- a/regexp.h
+++ b/regexp.h
@@ -783,8 +783,8 @@ struct re_save_state {
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/run.c b/run.c
index 7c1d0aa8cc..e66800195d 100644
--- a/run.c
+++ b/run.c
@@ -49,8 +49,8 @@ Perl_runops_standard(pTHX)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/scope.c b/scope.c
index a939f64927..5c34a49499 100644
--- a/scope.c
+++ b/scope.c
@@ -1273,8 +1273,8 @@ Perl_cx_dump(pTHX_ PERL_CONTEXT *cx)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/scope.h b/scope.h
index 38da244169..09a91f52ea 100644
--- a/scope.h
+++ b/scope.h
@@ -280,8 +280,8 @@ scope has the given name. Name must be a literal string.
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/sv.c b/sv.c
index fa8899d80e..6929e545d7 100644
--- a/sv.c
+++ b/sv.c
@@ -14479,8 +14479,8 @@ Perl_report_uninit(pTHX_ const SV *uninit_sv)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/sv.h b/sv.h
index 97ce119dd0..ff7565fce9 100644
--- a/sv.h
+++ b/sv.h
@@ -2125,8 +2125,8 @@ Evaluates I<sv> more than once.  Sets I<len> to 0 if C<SvOOK(sv)> is false.
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/t/op/groups.t b/t/op/groups.t
index e6b20353bf..dc2631e7fa 100644
--- a/t/op/groups.t
+++ b/t/op/groups.t
@@ -406,4 +406,4 @@ sub uniq {
 # indent-tabs-mode: nil
 # End:
 #
-# ex: set ts=8 sts=4 sw=4 noet:
+# ex: set ts=8 sts=4 sw=4 et:
diff --git a/taint.c b/taint.c
index 72bb9791d1..4631b66385 100644
--- a/taint.c
+++ b/taint.c
@@ -182,8 +182,8 @@ Perl_taint_env(pTHX)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/thread.h b/thread.h
index 3b84f369f7..8c8e23e9df 100644
--- a/thread.h
+++ b/thread.h
@@ -441,8 +441,8 @@
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/toke.c b/toke.c
index 4a774b51e0..0d5e321997 100644
--- a/toke.c
+++ b/toke.c
@@ -11633,8 +11633,8 @@ Perl_parse_stmtseq(pTHX_ U32 flags)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/universal.c b/universal.c
index b37b0bac8d..af3207fd33 100644
--- a/universal.c
+++ b/universal.c
@@ -1433,8 +1433,8 @@ Perl_boot_core_UNIVERSAL(pTHX)
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/unixish.h b/unixish.h
index 781b0494a5..c129ed18b3 100644
--- a/unixish.h
+++ b/unixish.h
@@ -150,8 +150,8 @@
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/utf8.c b/utf8.c
index 3d57154284..b18769f330 100644
--- a/utf8.c
+++ b/utf8.c
@@ -4557,8 +4557,8 @@ Perl_foldEQ_utf8_flags(pTHX_ const char *s1, char **pe1, register UV l1, bool u1
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/utf8.h b/utf8.h
index cad98b3fa3..82d90f0a91 100644
--- a/utf8.h
+++ b/utf8.h
@@ -615,8 +615,8 @@ Perl's extended UTF-8 means we can have start bytes up to FF.
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/utfebcdic.h b/utfebcdic.h
index eff444e7fd..ec7a376550 100644
--- a/utfebcdic.h
+++ b/utfebcdic.h
@@ -600,8 +600,8 @@ END_EXTERN_C
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/util.c b/util.c
index 378ffe05bf..55834e2764 100644
--- a/util.c
+++ b/util.c
@@ -6657,8 +6657,8 @@ Perl_get_re_arg(pTHX_ SV *sv) {
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/util.h b/util.h
index 3981656eae..ebc2bad9ac 100644
--- a/util.h
+++ b/util.h
@@ -57,8 +57,8 @@ This is a synonym for (! foldEQ_locale())
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */