From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Mon, 9 Feb 2009 18:29:43 +0000 (+0000)
Subject: Add emacs and vim editing settings to the bottom of *.py files.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff2f192f190b04db6217f19135fd7673b4a0abb8;p=scons.git

Add emacs and vim editing settings to the bottom of *.py files.


git-svn-id: http://scons.tigris.org/svn/scons/trunk@3987 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---

diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py
index 48ba850b..a693f6a0 100644
--- a/QMTest/TestCmd.py
+++ b/QMTest/TestCmd.py
@@ -1471,3 +1471,9 @@ class TestCmd:
         if mode[0] != 'w':
             raise ValueError, "mode must begin with 'w'"
         open(file, mode).write(content)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/QMTest/TestCommon.py b/QMTest/TestCommon.py
index 9b5702a2..5431b8ca 100644
--- a/QMTest/TestCommon.py
+++ b/QMTest/TestCommon.py
@@ -620,3 +620,9 @@ class TestCommon(TestCmd):
             # We're under the development directory for this change,
             # so this is an Aegis invocation; pass the test (exit 0).
             self.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/QMTest/TestRuntest.py b/QMTest/TestRuntest.py
index e44cd27b..08cfb4f5 100644
--- a/QMTest/TestRuntest.py
+++ b/QMTest/TestRuntest.py
@@ -177,3 +177,9 @@ class TestRuntest(TestCommon):
 
     def write_passing_test(self, name):
         self.write(name, passing_test_template)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 4a4941d7..729243d5 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -993,3 +993,9 @@ SConscript( sconscript )
 # test/AR.py for sample usage).
 
 noisy_ar=r'(ar: creating( archive)? \S+\n?)*'
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/QMTest/TestSConsMSVS.py b/QMTest/TestSConsMSVS.py
index 7d9e9a01..0408b679 100644
--- a/QMTest/TestSConsMSVS.py
+++ b/QMTest/TestSConsMSVS.py
@@ -661,3 +661,9 @@ print "self._msvs_versions =", str(env['MSVS']['VERSIONS'])
             if os.path.exists(p):
                 return p
         return apply(os.path.join, [vs_path] + sub_paths[version][0])
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/QMTest/TestSCons_time.py b/QMTest/TestSCons_time.py
index 1fc9dea6..869e0cb4 100644
--- a/QMTest/TestSCons_time.py
+++ b/QMTest/TestSCons_time.py
@@ -352,3 +352,9 @@ class TestSCons_time(TestCommon):
         path = write_sample(archive, dir, self.sample_project_files)
 
         return path
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/QMTest/TestSConsign.py b/QMTest/TestSConsign.py
index fd8ef306..29d8b2ce 100644
--- a/QMTest/TestSConsign.py
+++ b/QMTest/TestSConsign.py
@@ -82,3 +82,9 @@ class TestSConsign(TestSCons):
     def run_sconsign(self, *args, **kw):
         kw.update(self.my_kw)
         return apply(self.run, args, kw)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/QMTest/scons_tdb.py b/QMTest/scons_tdb.py
index 954b8df6..2262808b 100644
--- a/QMTest/scons_tdb.py
+++ b/QMTest/scons_tdb.py
@@ -597,3 +597,9 @@ class Database(database.Database):
                                       get_explicit_arguments(r))
 
         raise database.NoSuchResourceError(resource_id)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/QMTest/unittest.py b/QMTest/unittest.py
index f0540a5f..c74a4c76 100644
--- a/QMTest/unittest.py
+++ b/QMTest/unittest.py
@@ -691,3 +691,9 @@ main = TestProgram
 
 if __name__ == "__main__":
     main(module=None)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bench/bench.py b/bench/bench.py
index 3c5dd50b..07c0384c 100644
--- a/bench/bench.py
+++ b/bench/bench.py
@@ -121,3 +121,9 @@ for func in FunctionList:
     for label, args, kw in Data:
         r = apply(timer, (func,)+args, kw)
         display(label, r)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bench/dependency-func.py b/bench/dependency-func.py
index 0af411d9..beaa6266 100644
--- a/bench/dependency-func.py
+++ b/bench/dependency-func.py
@@ -96,3 +96,9 @@ Data = [
         {},
     ),
 ]
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bench/env.__setitem__.py b/bench/env.__setitem__.py
index 3826176f..d20785ae 100644
--- a/bench/env.__setitem__.py
+++ b/bench/env.__setitem__.py
@@ -360,3 +360,9 @@ run_it('Results for adding 100 new, unique variable names:',
       common_imports + """
 import __main__ ; names = __main__.uniq_variable_names
 """)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bench/is_types.py b/bench/is_types.py
index 1f4805b9..d2254657 100644
--- a/bench/is_types.py
+++ b/bench/is_types.py
@@ -329,3 +329,9 @@ Data = [
         {},
     ),
 ]
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bench/lvars-gvars.py b/bench/lvars-gvars.py
index efcef2ad..724b7a2e 100644
--- a/bench/lvars-gvars.py
+++ b/bench/lvars-gvars.py
@@ -72,3 +72,8 @@ Data = [
     ),
 ]
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bench/timeit.py b/bench/timeit.py
index d5e33bb1..cc087e1b 100644
--- a/bench/timeit.py
+++ b/bench/timeit.py
@@ -295,3 +295,9 @@ def main(args=None):
 
 if __name__ == "__main__":
     sys.exit(main())
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/Command.py b/bin/Command.py
index ebdf589f..b47e896a 100644
--- a/bin/Command.py
+++ b/bin/Command.py
@@ -127,3 +127,9 @@ Usage:  script-template.py [-hnq]
 
 if __name__ == "__main__":
     sys.exit(main())
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/SConsDoc.py b/bin/SConsDoc.py
index 96625b46..d3a043b7 100644
--- a/bin/SConsDoc.py
+++ b/bin/SConsDoc.py
@@ -328,3 +328,9 @@ def importfile(path):
         return None
     file.close()
     return module
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/caller-tree.py b/bin/caller-tree.py
index 5d907b83..85bb5998 100644
--- a/bin/caller-tree.py
+++ b/bin/caller-tree.py
@@ -88,3 +88,9 @@ def print_entry(e, level, calls):
 
 for e in [ e for e in AllCalls.values() if not e.calls ]:
     print_entry(e, 0, '')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/import-test.py b/bin/import-test.py
index 13995578..839d2ad3 100644
--- a/bin/import-test.py
+++ b/bin/import-test.py
@@ -96,3 +96,9 @@ subdir_list = [ str(l) for l in subdir_list ]
 sys.stdout.write('test.subdir(' + ',\n            '.join(subdir_list) + ')\n')
 
 print_files(Top)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/install_python.py b/bin/install_python.py
index 3027c050..fff834cd 100644
--- a/bin/install_python.py
+++ b/bin/install_python.py
@@ -134,3 +134,9 @@ sage:  installs-scons.py [-ahnq] [-d DIR] [-p PREFIX] [VERSION ...]
 
 if __name__ == "__main__":
     sys.exit(main())
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/install_scons.py b/bin/install_scons.py
index 25142e05..71e64771 100644
--- a/bin/install_scons.py
+++ b/bin/install_scons.py
@@ -203,3 +203,9 @@ Usage:  install-scons.py [-ahnq] [-d DIR] [-p PREFIX] [VERSION ...]
 
 if __name__ == "__main__":
     sys.exit(main())
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/memlogs.py b/bin/memlogs.py
index 1df691e0..9d957c9f 100644
--- a/bin/memlogs.py
+++ b/bin/memlogs.py
@@ -41,3 +41,9 @@ for fname in sys.argv[1:]:
     lines = [l for l in open(fname).readlines() if l[:7] == 'Memory ']
     t = tuple([l.split()[-1] for l in lines]) + (fname,)
     print fmt % t
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/memoicmp.py b/bin/memoicmp.py
index 01be6a49..f45ecb09 100644
--- a/bin/memoicmp.py
+++ b/bin/memoicmp.py
@@ -71,3 +71,8 @@ Compares --debug=memomize output from file1 against file2."""%sys.argv[0]
         memoize_cmp(sys.argv[1], sys.argv[2])
         sys.exit(0)
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/objcounts.py b/bin/objcounts.py
index db02aab4..ca814b44 100644
--- a/bin/objcounts.py
+++ b/bin/objcounts.py
@@ -101,3 +101,9 @@ keys = c2.keys()
 keys.sort()
 for k in keys:
     printline(['--']*4, c2[k], k)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/scons-diff.py b/bin/scons-diff.py
index 6cfe25ad..7c603083 100644
--- a/bin/scons-diff.py
+++ b/bin/scons-diff.py
@@ -187,3 +187,9 @@ def diff_dir(left, right):
             print 'Only in %s: %s' % (right, x)
 
 do_diff(left, right, True)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/scons-proc.py b/bin/scons-proc.py
index 9880ef30..cc3b0856 100644
--- a/bin/scons-proc.py
+++ b/bin/scons-proc.py
@@ -275,3 +275,9 @@ if variablesfiles:
             entityfunc = lambda x: '$'+x)
 
     g.write(variablesfiles)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/scons-test.py b/bin/scons-test.py
index ea756071..593a1a36 100644
--- a/bin/scons-test.py
+++ b/bin/scons-test.py
@@ -239,3 +239,9 @@ else:
     command = '"%s" runtest.py %s' % (sys.executable, runtest_args)
     #print command
     os.system(command)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/scons-unzip.py b/bin/scons-unzip.py
index f772dd56..28c73f88 100644
--- a/bin/scons-unzip.py
+++ b/bin/scons-unzip.py
@@ -68,3 +68,9 @@ for name in zf.namelist():
         os.unlink(dest)
     if not os.path.isdir(dest):
         open(dest, 'w').write(zf.read(name))
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/scons_dev_master.py b/bin/scons_dev_master.py
index 8faa803f..b23a166b 100644
--- a/bin/scons_dev_master.py
+++ b/bin/scons_dev_master.py
@@ -195,3 +195,9 @@ Usage:  scons_dev_master.py [-hnqy] [--password PASSWORD] [--username USER]
 
 if __name__ == "__main__":
     sys.exit(main())
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/sconsexamples.py b/bin/sconsexamples.py
index ac8dce3a..0a409bcd 100644
--- a/bin/sconsexamples.py
+++ b/bin/sconsexamples.py
@@ -504,3 +504,9 @@ x = MySGML()
 for c in data:
     x.feed(c)
 x.close()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/sconsoutput.py b/bin/sconsoutput.py
index ecc816ce..f99ec5a3 100644
--- a/bin/sconsoutput.py
+++ b/bin/sconsoutput.py
@@ -819,3 +819,9 @@ x = MySGML()
 for c in data:
     x.feed(c)
 x.close()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/svn-bisect.py b/bin/svn-bisect.py
index 3be32a00..e9ebcf89 100755
--- a/bin/svn-bisect.py
+++ b/bin/svn-bisect.py
@@ -64,3 +64,9 @@ while upper-lower > 1:
 # show which revision was first to fail
 if upperfails != lowerfails: lower = upper
 print "The error was caused by revision", lower
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bin/xmlagenda.py b/bin/xmlagenda.py
index 405c6989..3009e4c6 100755
--- a/bin/xmlagenda.py
+++ b/bin/xmlagenda.py
@@ -85,3 +85,9 @@ for issue in issues:
 	writer.writerow(['','','consensus','','','',''])
 	writer.writerow(['','','','','','',''])
 	for member in team: writer.writerow(['','',member,'','','',''])
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/bootstrap.py b/bootstrap.py
index 15a29cb2..165c081d 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -211,3 +211,9 @@ sys.stdout.flush()
 os.environ['SCONS_LIB_DIR'] = os.path.join(bootstrap_dir, src_engine)
 
 os.execve(sys.executable, args, os.environ)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/runtest.py b/runtest.py
index 877f1cd3..462aff99 100644
--- a/runtest.py
+++ b/runtest.py
@@ -802,3 +802,9 @@ elif len(no_result):
     sys.exit(2)
 else:
     sys.exit(0)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py
index 96a48a76..da041c66 100644
--- a/src/engine/SCons/Action.py
+++ b/src/engine/SCons/Action.py
@@ -1232,3 +1232,9 @@ class ActionFactory:
         ac = ActionCaller(self, args, kw)
         action = Action(ac, strfunction=ac.strfunction)
         return action
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/ActionTests.py b/src/engine/SCons/ActionTests.py
index ae6a15c2..3571980d 100644
--- a/src/engine/SCons/ActionTests.py
+++ b/src/engine/SCons/ActionTests.py
@@ -2005,3 +2005,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py
index 21638a5f..0f5bc76d 100644
--- a/src/engine/SCons/Builder.py
+++ b/src/engine/SCons/Builder.py
@@ -860,3 +860,9 @@ class CompositeBuilder(SCons.Util.Proxy):
     def add_action(self, suffix, action):
         self.cmdgen.add_action(suffix, action)
         self.set_src_suffix(self.cmdgen.src_suffixes())
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/BuilderTests.py b/src/engine/SCons/BuilderTests.py
index 91dd82a8..8bb41699 100644
--- a/src/engine/SCons/BuilderTests.py
+++ b/src/engine/SCons/BuilderTests.py
@@ -1642,3 +1642,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/CacheDir.py b/src/engine/SCons/CacheDir.py
index 7caee618..c5ec14e0 100644
--- a/src/engine/SCons/CacheDir.py
+++ b/src/engine/SCons/CacheDir.py
@@ -215,3 +215,9 @@ class CacheDir:
     def push_if_forced(self, node):
         if cache_force:
             return self.push(node)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/CacheDirTests.py b/src/engine/SCons/CacheDirTests.py
index 3715bf17..fd36ccea 100644
--- a/src/engine/SCons/CacheDirTests.py
+++ b/src/engine/SCons/CacheDirTests.py
@@ -289,3 +289,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Conftest.py b/src/engine/SCons/Conftest.py
index ba7dbf13..63273530 100644
--- a/src/engine/SCons/Conftest.py
+++ b/src/engine/SCons/Conftest.py
@@ -776,3 +776,9 @@ def _lang2suffix(lang):
 
 
 # vim: set sw=4 et sts=4 tw=79 fo+=l:
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Debug.py b/src/engine/SCons/Debug.py
index 095f5a25..8aa0c218 100644
--- a/src/engine/SCons/Debug.py
+++ b/src/engine/SCons/Debug.py
@@ -214,3 +214,9 @@ def Trace(msg, file=None, mode='w'):
             fp = file
     fp.write(msg)
     fp.flush()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py
index 2b4b967e..7d44e38f 100644
--- a/src/engine/SCons/Defaults.py
+++ b/src/engine/SCons/Defaults.py
@@ -470,3 +470,9 @@ ConstructionEnvironment = {
     'File'          : Variable_Method_Caller('TARGET', 'File'),
     'RDirs'         : Variable_Method_Caller('TARGET', 'RDirs'),
 }
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/DefaultsTests.py b/src/engine/SCons/DefaultsTests.py
index aec9e46e..3d9c1ee7 100644
--- a/src/engine/SCons/DefaultsTests.py
+++ b/src/engine/SCons/DefaultsTests.py
@@ -86,3 +86,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py
index e8a1bbbb..5a1077cf 100644
--- a/src/engine/SCons/Environment.py
+++ b/src/engine/SCons/Environment.py
@@ -2308,3 +2308,9 @@ def NoSubstitutionProxy(subject):
             self.raw_to_mode(nkw)
             return apply(SCons.Subst.scons_subst, nargs, nkw)
     return _NoSubstitutionProxy(subject)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py
index 77d46026..e6f1c936 100644
--- a/src/engine/SCons/EnvironmentTests.py
+++ b/src/engine/SCons/EnvironmentTests.py
@@ -3955,3 +3955,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Errors.py b/src/engine/SCons/Errors.py
index 0ac20c4f..fc45279f 100644
--- a/src/engine/SCons/Errors.py
+++ b/src/engine/SCons/Errors.py
@@ -196,3 +196,9 @@ def convert_to_BuildError(status, exc_info=None):
     #import sys
     #sys.stderr.write("convert_to_BuildError: status %s => (errstr %s, status %s)"%(status,buildError.errstr, buildError.status))
     return buildError
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/ErrorsTests.py b/src/engine/SCons/ErrorsTests.py
index 893d2842..40285e4d 100644
--- a/src/engine/SCons/ErrorsTests.py
+++ b/src/engine/SCons/ErrorsTests.py
@@ -101,3 +101,9 @@ if __name__ == "__main__":
     suite = unittest.makeSuite(ErrorsTestCase, 'test_')
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Executor.py b/src/engine/SCons/Executor.py
index 9a4f7f0b..4da42d5a 100644
--- a/src/engine/SCons/Executor.py
+++ b/src/engine/SCons/Executor.py
@@ -629,3 +629,8 @@ class Null:
         self.set_action_list(action)
 
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/ExecutorTests.py b/src/engine/SCons/ExecutorTests.py
index 37c253df..205553a8 100644
--- a/src/engine/SCons/ExecutorTests.py
+++ b/src/engine/SCons/ExecutorTests.py
@@ -458,3 +458,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Job.py b/src/engine/SCons/Job.py
index f83e0ca7..e2375f8a 100644
--- a/src/engine/SCons/Job.py
+++ b/src/engine/SCons/Job.py
@@ -427,3 +427,9 @@ else:
 
             self.tp.cleanup()
             self.taskmaster.cleanup()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/JobTests.py b/src/engine/SCons/JobTests.py
index 852cb915..793a8b74 100644
--- a/src/engine/SCons/JobTests.py
+++ b/src/engine/SCons/JobTests.py
@@ -531,3 +531,9 @@ if __name__ == "__main__":
         sys.exit(2)
     elif not result.wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Memoize.py b/src/engine/SCons/Memoize.py
index c4a5001e..966a618d 100644
--- a/src/engine/SCons/Memoize.py
+++ b/src/engine/SCons/Memoize.py
@@ -284,3 +284,9 @@ else:
     def EnableMemoization():
         global use_memoizer
         use_memoizer = 1
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/MemoizeTests.py b/src/engine/SCons/MemoizeTests.py
index bceeebf8..14520527 100644
--- a/src/engine/SCons/MemoizeTests.py
+++ b/src/engine/SCons/MemoizeTests.py
@@ -190,3 +190,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Node/Alias.py b/src/engine/SCons/Node/Alias.py
index 93558f90..d599335f 100644
--- a/src/engine/SCons/Node/Alias.py
+++ b/src/engine/SCons/Node/Alias.py
@@ -145,3 +145,9 @@ class Alias(SCons.Node.Node):
 default_ans = AliasNameSpace()
 
 SCons.Node.arg2nodes_lookups.append(default_ans.lookup)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Node/AliasTests.py b/src/engine/SCons/Node/AliasTests.py
index 02488f00..184e7104 100644
--- a/src/engine/SCons/Node/AliasTests.py
+++ b/src/engine/SCons/Node/AliasTests.py
@@ -122,3 +122,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 42b40233..76852aa4 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -3156,3 +3156,8 @@ def invalidate_node_memos(targets):
             if node:
                 node.clear_memoized_values()                        
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index e2a1e9e0..642d7019 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -3506,3 +3506,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Node/NodeTests.py b/src/engine/SCons/Node/NodeTests.py
index 73e1e057..ce56d5a5 100644
--- a/src/engine/SCons/Node/NodeTests.py
+++ b/src/engine/SCons/Node/NodeTests.py
@@ -1303,3 +1303,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Node/Python.py b/src/engine/SCons/Node/Python.py
index 741d7e9f..132c425a 100644
--- a/src/engine/SCons/Node/Python.py
+++ b/src/engine/SCons/Node/Python.py
@@ -117,3 +117,9 @@ class Value(SCons.Node.Node):
         contents = self.get_contents()
         self.get_ninfo().csig = contents
         return contents
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Node/PythonTests.py b/src/engine/SCons/Node/PythonTests.py
index 1827a305..1dc2bb7f 100644
--- a/src/engine/SCons/Node/PythonTests.py
+++ b/src/engine/SCons/Node/PythonTests.py
@@ -122,3 +122,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index c44525f3..6852f69b 100644
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -1328,3 +1328,9 @@ class Walker:
 
 
 arg2nodes_lookups = []
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Options/BoolOption.py b/src/engine/SCons/Options/BoolOption.py
index a247ef53..652cf5ee 100644
--- a/src/engine/SCons/Options/BoolOption.py
+++ b/src/engine/SCons/Options/BoolOption.py
@@ -42,3 +42,9 @@ def BoolOption(*args, **kw):
         SCons.Warnings.warn(SCons.Warnings.DeprecatedOptionsWarning, msg)
         warned = True
     return apply(SCons.Variables.BoolVariable, args, kw)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Options/EnumOption.py b/src/engine/SCons/Options/EnumOption.py
index f4c3c032..e89b5b9a 100644
--- a/src/engine/SCons/Options/EnumOption.py
+++ b/src/engine/SCons/Options/EnumOption.py
@@ -42,3 +42,9 @@ def EnumOption(*args, **kw):
         SCons.Warnings.warn(SCons.Warnings.DeprecatedOptionsWarning, msg)
         warned = True
     return apply(SCons.Variables.EnumVariable, args, kw)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Options/ListOption.py b/src/engine/SCons/Options/ListOption.py
index 88334d44..a6609242 100644
--- a/src/engine/SCons/Options/ListOption.py
+++ b/src/engine/SCons/Options/ListOption.py
@@ -42,3 +42,9 @@ def ListOption(*args, **kw):
         SCons.Warnings.warn(SCons.Warnings.DeprecatedOptionsWarning, msg)
         warned = True
     return apply(SCons.Variables.ListVariable, args, kw)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Options/PackageOption.py b/src/engine/SCons/Options/PackageOption.py
index 0f5ef7f6..51f9f9bf 100644
--- a/src/engine/SCons/Options/PackageOption.py
+++ b/src/engine/SCons/Options/PackageOption.py
@@ -42,3 +42,9 @@ def PackageOption(*args, **kw):
         SCons.Warnings.warn(SCons.Warnings.DeprecatedOptionsWarning, msg)
         warned = True
     return apply(SCons.Variables.PackageVariable, args, kw)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Options/PathOption.py b/src/engine/SCons/Options/PathOption.py
index 3223ac36..fd1130b9 100644
--- a/src/engine/SCons/Options/PathOption.py
+++ b/src/engine/SCons/Options/PathOption.py
@@ -68,3 +68,9 @@ class _PathOptionClass:
         return apply(SCons.Variables.PathVariable.PathExists, args, kw)
 
 PathOption = _PathOptionClass()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Options/__init__.py b/src/engine/SCons/Options/__init__.py
index e1e8b3fb..104aa82d 100644
--- a/src/engine/SCons/Options/__init__.py
+++ b/src/engine/SCons/Options/__init__.py
@@ -66,3 +66,9 @@ class Options(SCons.Variables.Variables):
         return apply(SCons.Variables.Variables.FormatVariableHelpText,
                      (self,) + args,
                      kw)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/PathList.py b/src/engine/SCons/PathList.py
index ae00fc0d..9da0f314 100644
--- a/src/engine/SCons/PathList.py
+++ b/src/engine/SCons/PathList.py
@@ -224,3 +224,9 @@ PathList = PathListCache().PathList
 
 
 del PathListCache
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/PathListTests.py b/src/engine/SCons/PathListTests.py
index 8203ccff..faecc4db 100644
--- a/src/engine/SCons/PathListTests.py
+++ b/src/engine/SCons/PathListTests.py
@@ -162,3 +162,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Platform/PlatformTests.py b/src/engine/SCons/Platform/PlatformTests.py
index bbfdd92d..4f2e3d93 100644
--- a/src/engine/SCons/Platform/PlatformTests.py
+++ b/src/engine/SCons/Platform/PlatformTests.py
@@ -116,3 +116,9 @@ if __name__ == "__main__":
     suite = unittest.makeSuite(PlatformTestCase, 'test_')
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Platform/__init__.py b/src/engine/SCons/Platform/__init__.py
index e9a6a0ba..964ed67f 100644
--- a/src/engine/SCons/Platform/__init__.py
+++ b/src/engine/SCons/Platform/__init__.py
@@ -225,3 +225,9 @@ def Platform(name = platform_default()):
     spec = PlatformSpec(name)
     spec.__call__ = module.generate
     return spec
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Platform/aix.py b/src/engine/SCons/Platform/aix.py
index 3f77e3b3..a5f95731 100644
--- a/src/engine/SCons/Platform/aix.py
+++ b/src/engine/SCons/Platform/aix.py
@@ -63,3 +63,8 @@ def generate(env):
     #Based on AIX 5.2: ARG_MAX=24576 - 3000 for environment expansion
     env['MAXLINELENGTH']  = 21576
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Platform/cygwin.py b/src/engine/SCons/Platform/cygwin.py
index 30227989..a0126826 100644
--- a/src/engine/SCons/Platform/cygwin.py
+++ b/src/engine/SCons/Platform/cygwin.py
@@ -47,3 +47,9 @@ def generate(env):
     env['TEMPFILE']    = TempFileMunge
     env['TEMPFILEPREFIX'] = '@'
     env['MAXLINELENGTH']  = 2048
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Platform/darwin.py b/src/engine/SCons/Platform/darwin.py
index fc4c773f..070719e9 100644
--- a/src/engine/SCons/Platform/darwin.py
+++ b/src/engine/SCons/Platform/darwin.py
@@ -38,3 +38,9 @@ def generate(env):
     posix.generate(env)
     env['SHLIBSUFFIX'] = '.dylib'
     env['ENV']['PATH'] = env['ENV']['PATH'] + ':/sw/bin'
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Platform/hpux.py b/src/engine/SCons/Platform/hpux.py
index ddbfafc4..43d284b5 100644
--- a/src/engine/SCons/Platform/hpux.py
+++ b/src/engine/SCons/Platform/hpux.py
@@ -38,3 +38,9 @@ def generate(env):
     posix.generate(env)
     #Based on HP-UX11i: ARG_MAX=2048000 - 3000 for environment expansion
     env['MAXLINELENGTH']  = 2045000
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Platform/irix.py b/src/engine/SCons/Platform/irix.py
index 861ecace..2baee0bb 100644
--- a/src/engine/SCons/Platform/irix.py
+++ b/src/engine/SCons/Platform/irix.py
@@ -36,3 +36,9 @@ import posix
 
 def generate(env):
     posix.generate(env)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Platform/os2.py b/src/engine/SCons/Platform/os2.py
index 3139c535..41e8312c 100644
--- a/src/engine/SCons/Platform/os2.py
+++ b/src/engine/SCons/Platform/os2.py
@@ -47,3 +47,9 @@ def generate(env):
     env['SHLIBSUFFIX']    = '.dll'
     env['LIBPREFIXES']    = '$LIBPREFIX'
     env['LIBSUFFIXES']    = [ '$LIBSUFFIX', '$SHLIBSUFFIX' ]
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
index 12a6f600..f18569ff 100644
--- a/src/engine/SCons/Platform/posix.py
+++ b/src/engine/SCons/Platform/posix.py
@@ -256,3 +256,9 @@ def generate(env):
 
     # This platform supports RPATH specifications.
     env['__RPATH'] = '$_RPATH'
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Platform/sunos.py b/src/engine/SCons/Platform/sunos.py
index 50298608..d23d65c5 100644
--- a/src/engine/SCons/Platform/sunos.py
+++ b/src/engine/SCons/Platform/sunos.py
@@ -42,3 +42,9 @@ def generate(env):
     env['PKGINFO'] = 'pkginfo'
     env['PKGCHK'] = '/usr/sbin/pkgchk'
     env['ENV']['PATH'] = env['ENV']['PATH'] + ':/opt/SUNWspro/bin:/usr/ccs/bin'
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py
index 2fa30cc5..79d73b39 100644
--- a/src/engine/SCons/Platform/win32.py
+++ b/src/engine/SCons/Platform/win32.py
@@ -322,3 +322,9 @@ def generate(env):
     env['TEMPFILEPREFIX'] = '@'
     env['MAXLINELENGTH']  = 2048
     env['ESCAPE']         = escape
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py
index fbf193a4..38b3ddb9 100644
--- a/src/engine/SCons/SConf.py
+++ b/src/engine/SCons/SConf.py
@@ -1021,3 +1021,9 @@ def CheckLibWithHeader(context, libs, header, language,
             call = call, language = language, autoadd = autoadd)
     context.did_show_result = 1
     return not res
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/SConfTests.py b/src/engine/SCons/SConfTests.py
index f5b53f11..24cfb8d6 100644
--- a/src/engine/SCons/SConfTests.py
+++ b/src/engine/SCons/SConfTests.py
@@ -750,3 +750,8 @@ if __name__ == "__main__":
     if not res.wasSuccessful():
         sys.exit(1)
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/SConsign.py b/src/engine/SCons/SConsign.py
index b46d9adb..a87eeeb1 100644
--- a/src/engine/SCons/SConsign.py
+++ b/src/engine/SCons/SConsign.py
@@ -373,3 +373,9 @@ def File(name, dbm_module=None):
         DB_Name = name
         if not dbm_module is None:
             DB_Module = dbm_module
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/SConsignTests.py b/src/engine/SCons/SConsignTests.py
index 2a04c897..9a020445 100644
--- a/src/engine/SCons/SConsignTests.py
+++ b/src/engine/SCons/SConsignTests.py
@@ -389,3 +389,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/C.py b/src/engine/SCons/Scanner/C.py
index 4356c7a4..622ac677 100644
--- a/src/engine/SCons/Scanner/C.py
+++ b/src/engine/SCons/Scanner/C.py
@@ -124,3 +124,9 @@ def CScanner():
                                   "CPPPATH",
                                   '^[ \t]*#[ \t]*(?:include|import)[ \t]*(<|")([^>"]+)(>|")')
     return cs
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/CTests.py b/src/engine/SCons/Scanner/CTests.py
index cadc491a..a62f4c1a 100644
--- a/src/engine/SCons/Scanner/CTests.py
+++ b/src/engine/SCons/Scanner/CTests.py
@@ -460,3 +460,9 @@ if __name__ == "__main__":
     result = runner.run(suite())
     if not result.wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/D.py b/src/engine/SCons/Scanner/D.py
index dc3478a4..4134337a 100644
--- a/src/engine/SCons/Scanner/D.py
+++ b/src/engine/SCons/Scanner/D.py
@@ -66,3 +66,9 @@ class D(SCons.Scanner.Classic):
         for i in self.cre.findall(node.get_text_contents()):
             includes = includes + self.cre2.findall(i)
         return includes
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/Dir.py b/src/engine/SCons/Scanner/Dir.py
index 9203fb27..a623c99c 100644
--- a/src/engine/SCons/Scanner/Dir.py
+++ b/src/engine/SCons/Scanner/Dir.py
@@ -103,3 +103,9 @@ def scan_in_memory(node, env, path=()):
     entry_list = filter(do_not_scan, entries.keys())
     entry_list.sort()
     return map(lambda n, e=entries: e[n], entry_list)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/DirTests.py b/src/engine/SCons/Scanner/DirTests.py
index 5f180bcb..5d59bd56 100644
--- a/src/engine/SCons/Scanner/DirTests.py
+++ b/src/engine/SCons/Scanner/DirTests.py
@@ -132,3 +132,9 @@ if __name__ == "__main__":
     result = runner.run(suite())
     if not result.wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/Fortran.py b/src/engine/SCons/Scanner/Fortran.py
index d2358ba7..2aed6538 100644
--- a/src/engine/SCons/Scanner/Fortran.py
+++ b/src/engine/SCons/Scanner/Fortran.py
@@ -312,3 +312,9 @@ def FortranScan(path_variable="FORTRANPATH"):
                          include_regex,
                          def_regex)
     return scanner
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/FortranTests.py b/src/engine/SCons/Scanner/FortranTests.py
index ff63bda2..570b5658 100644
--- a/src/engine/SCons/Scanner/FortranTests.py
+++ b/src/engine/SCons/Scanner/FortranTests.py
@@ -535,3 +535,9 @@ if __name__ == "__main__":
     result = runner.run(suite())
     if not result.wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/IDL.py b/src/engine/SCons/Scanner/IDL.py
index b0fd8ed5..18084e85 100644
--- a/src/engine/SCons/Scanner/IDL.py
+++ b/src/engine/SCons/Scanner/IDL.py
@@ -40,3 +40,9 @@ def IDLScan():
                                   "CPPPATH",
                                   '^[ \t]*(?:#[ \t]*include|[ \t]*import)[ \t]+(<|")([^>"]+)(>|")')
     return cs
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/IDLTests.py b/src/engine/SCons/Scanner/IDLTests.py
index bca2ac87..a454b31d 100644
--- a/src/engine/SCons/Scanner/IDLTests.py
+++ b/src/engine/SCons/Scanner/IDLTests.py
@@ -445,3 +445,9 @@ if __name__ == "__main__":
     result = runner.run(suite())
     if not result.wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/LaTeX.py b/src/engine/SCons/Scanner/LaTeX.py
index a96c2791..530c948c 100644
--- a/src/engine/SCons/Scanner/LaTeX.py
+++ b/src/engine/SCons/Scanner/LaTeX.py
@@ -335,3 +335,9 @@ class LaTeX(SCons.Scanner.Base):
         nodes.sort()
         nodes = map(lambda pair: pair[1], nodes)
         return nodes
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/LaTeXTests.py b/src/engine/SCons/Scanner/LaTeXTests.py
index 648737c5..e87a1aa4 100644
--- a/src/engine/SCons/Scanner/LaTeXTests.py
+++ b/src/engine/SCons/Scanner/LaTeXTests.py
@@ -154,3 +154,9 @@ if __name__ == "__main__":
     result = runner.run(suite())
     if not result.wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/Prog.py b/src/engine/SCons/Scanner/Prog.py
index 102205f2..bd7bffe2 100644
--- a/src/engine/SCons/Scanner/Prog.py
+++ b/src/engine/SCons/Scanner/Prog.py
@@ -95,3 +95,9 @@ def scan(node, env, libpath = ()):
             result.append(lib)
 
     return result
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/ProgTests.py b/src/engine/SCons/Scanner/ProgTests.py
index 47d4afdb..7eaafcc7 100644
--- a/src/engine/SCons/Scanner/ProgTests.py
+++ b/src/engine/SCons/Scanner/ProgTests.py
@@ -254,3 +254,9 @@ if __name__ == "__main__":
     result = runner.run(suite())
     if not result.wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/RC.py b/src/engine/SCons/Scanner/RC.py
index 529cb5d3..f8313fba 100644
--- a/src/engine/SCons/Scanner/RC.py
+++ b/src/engine/SCons/Scanner/RC.py
@@ -47,3 +47,9 @@ def RCScan():
                                            res_re )
     
     return resScanner
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/RCTests.py b/src/engine/SCons/Scanner/RCTests.py
index 41954f13..bf1048d0 100644
--- a/src/engine/SCons/Scanner/RCTests.py
+++ b/src/engine/SCons/Scanner/RCTests.py
@@ -160,3 +160,9 @@ if __name__ == "__main__":
     result = runner.run(suite())
     if not result.wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/ScannerTests.py b/src/engine/SCons/Scanner/ScannerTests.py
index f6750dce..e3fa4edc 100644
--- a/src/engine/SCons/Scanner/ScannerTests.py
+++ b/src/engine/SCons/Scanner/ScannerTests.py
@@ -592,3 +592,9 @@ if __name__ == "__main__":
     result = runner.run(suite())
     if not result.wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Scanner/__init__.py b/src/engine/SCons/Scanner/__init__.py
index 2d53cad2..0ba94b7b 100644
--- a/src/engine/SCons/Scanner/__init__.py
+++ b/src/engine/SCons/Scanner/__init__.py
@@ -404,3 +404,9 @@ class ClassicCPP(Classic):
 
     def sort_key(self, include):
         return SCons.Node.FS._my_normcase(string.join(include))
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Script/Interactive.py b/src/engine/SCons/Script/Interactive.py
index 05c58071..206f9410 100644
--- a/src/engine/SCons/Script/Interactive.py
+++ b/src/engine/SCons/Script/Interactive.py
@@ -378,3 +378,9 @@ def interact(fs, parser, options, targets, target_top):
                             targets = targets,
                             target_top = target_top)
     c.cmdloop()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index 6cd57ceb..cad241f0 100644
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -1318,3 +1318,9 @@ def main():
         print "Total command execution time: %f seconds"%ct
 
     sys.exit(exit_status)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Script/MainTests.py b/src/engine/SCons/Script/MainTests.py
index fe32df91..4fe760c4 100644
--- a/src/engine/SCons/Script/MainTests.py
+++ b/src/engine/SCons/Script/MainTests.py
@@ -45,3 +45,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Script/SConsOptions.py b/src/engine/SCons/Script/SConsOptions.py
index d01ec043..cf2d9977 100644
--- a/src/engine/SCons/Script/SConsOptions.py
+++ b/src/engine/SCons/Script/SConsOptions.py
@@ -938,3 +938,9 @@ def Parser(version):
                   help=SUPPRESS_HELP)
 
     return op
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index 4119a3b6..6569c95e 100644
--- a/src/engine/SCons/Script/SConscript.py
+++ b/src/engine/SCons/Script/SConscript.py
@@ -630,3 +630,9 @@ def BuildDefaultGlobals():
              GlobalDict[m] = d[m]
 
     return GlobalDict.copy()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Script/SConscriptTests.py b/src/engine/SCons/Script/SConscriptTests.py
index 931165bd..8b2521d7 100644
--- a/src/engine/SCons/Script/SConscriptTests.py
+++ b/src/engine/SCons/Script/SConscriptTests.py
@@ -26,3 +26,9 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import SCons.Script.SConscript
 
 # all of the SConscript.py tests are in test/SConscript.py 
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index 72e31d1e..18ef1146 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -406,3 +406,9 @@ SConscript.DefaultTargets = DEFAULT_TARGETS
 # unlikely enough that we're going to leave this as is and cross that
 # bridge if someone actually comes to it.
 Command = _SConscript.DefaultEnvironmentCall('Command', subst=1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Sig.py b/src/engine/SCons/Sig.py
index 80bb8108..935596e9 100644
--- a/src/engine/SCons/Sig.py
+++ b/src/engine/SCons/Sig.py
@@ -55,3 +55,9 @@ class TimeStampNull(SCons.Util.Null):
 
 MD5 = MD5Null()
 TimeStamp = TimeStampNull()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Subst.py b/src/engine/SCons/Subst.py
index 6459eeca..f3b4168c 100644
--- a/src/engine/SCons/Subst.py
+++ b/src/engine/SCons/Subst.py
@@ -903,3 +903,9 @@ def scons_subst_once(strSubst, env, key):
         return _dollar_exps.sub(sub_match, strSubst)
     else:
         return strSubst
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/SubstTests.py b/src/engine/SCons/SubstTests.py
index 33f0f945..0dda3a22 100644
--- a/src/engine/SCons/SubstTests.py
+++ b/src/engine/SCons/SubstTests.py
@@ -1234,3 +1234,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Taskmaster.py b/src/engine/SCons/Taskmaster.py
index 42454801..8e71be96 100644
--- a/src/engine/SCons/Taskmaster.py
+++ b/src/engine/SCons/Taskmaster.py
@@ -1014,3 +1014,9 @@ class Taskmaster:
                     (node, repr(node), StateString[node.get_state()])
 
         raise SCons.Errors.UserError, desc
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/TaskmasterTests.py b/src/engine/SCons/TaskmasterTests.py
index c8bbdf46..282f4dff 100644
--- a/src/engine/SCons/TaskmasterTests.py
+++ b/src/engine/SCons/TaskmasterTests.py
@@ -1126,3 +1126,9 @@ if __name__ == "__main__":
     suite = unittest.makeSuite(TaskmasterTestCase, 'test_')
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/386asm.py b/src/engine/SCons/Tool/386asm.py
index 1a595257..8acc55f4 100644
--- a/src/engine/SCons/Tool/386asm.py
+++ b/src/engine/SCons/Tool/386asm.py
@@ -53,3 +53,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('386asm')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/BitKeeper.py b/src/engine/SCons/Tool/BitKeeper.py
index b6561f4f..004ffeb6 100644
--- a/src/engine/SCons/Tool/BitKeeper.py
+++ b/src/engine/SCons/Tool/BitKeeper.py
@@ -57,3 +57,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('bk')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/CVS.py b/src/engine/SCons/Tool/CVS.py
index bc186153..e71635ef 100644
--- a/src/engine/SCons/Tool/CVS.py
+++ b/src/engine/SCons/Tool/CVS.py
@@ -65,3 +65,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('cvs')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/FortranCommon.py b/src/engine/SCons/Tool/FortranCommon.py
index bf32ffae..2863f18d 100644
--- a/src/engine/SCons/Tool/FortranCommon.py
+++ b/src/engine/SCons/Tool/FortranCommon.py
@@ -239,3 +239,9 @@ def add_all_to_env(env):
     add_f77_to_env(env)
     add_f90_to_env(env)
     add_f95_to_env(env)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/JavaCommon.py b/src/engine/SCons/Tool/JavaCommon.py
index 58489dbb..6f513f1d 100644
--- a/src/engine/SCons/Tool/JavaCommon.py
+++ b/src/engine/SCons/Tool/JavaCommon.py
@@ -315,3 +315,9 @@ else:
         the path to the file is the same as the package name.
         """
         return os.path.split(file)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/JavaCommonTests.py b/src/engine/SCons/Tool/JavaCommonTests.py
index bffe09e0..f4a43efb 100644
--- a/src/engine/SCons/Tool/JavaCommonTests.py
+++ b/src/engine/SCons/Tool/JavaCommonTests.py
@@ -545,3 +545,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/Perforce.py b/src/engine/SCons/Tool/Perforce.py
index de87dc25..ba3a9535 100644
--- a/src/engine/SCons/Tool/Perforce.py
+++ b/src/engine/SCons/Tool/Perforce.py
@@ -96,3 +96,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('p4')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/PharLapCommon.py b/src/engine/SCons/Tool/PharLapCommon.py
index 7f562c53..ca19b8a3 100644
--- a/src/engine/SCons/Tool/PharLapCommon.py
+++ b/src/engine/SCons/Tool/PharLapCommon.py
@@ -130,3 +130,9 @@ def addPharLapPaths(env):
     env['PHARLAP_PATH'] = getPharLapPath()
     env['PHARLAP_VERSION'] = str(getPharLapVersion())
     
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/PharLapCommonTests.py b/src/engine/SCons/Tool/PharLapCommonTests.py
index d1794570..d1e7f602 100644
--- a/src/engine/SCons/Tool/PharLapCommonTests.py
+++ b/src/engine/SCons/Tool/PharLapCommonTests.py
@@ -60,3 +60,9 @@ if __name__ == "__main__":
     suite = unittest.makeSuite(PharLapCommonTestCase, 'test_')
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/RCS.py b/src/engine/SCons/Tool/RCS.py
index 9cc20f5b..bb4721b8 100644
--- a/src/engine/SCons/Tool/RCS.py
+++ b/src/engine/SCons/Tool/RCS.py
@@ -56,3 +56,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('rcs')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/SCCS.py b/src/engine/SCons/Tool/SCCS.py
index a9a595df..99582e2e 100644
--- a/src/engine/SCons/Tool/SCCS.py
+++ b/src/engine/SCons/Tool/SCCS.py
@@ -56,3 +56,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('sccs')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/Subversion.py b/src/engine/SCons/Tool/Subversion.py
index 4bb37f72..05a8adb5 100644
--- a/src/engine/SCons/Tool/Subversion.py
+++ b/src/engine/SCons/Tool/Subversion.py
@@ -63,3 +63,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('svn')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/ToolTests.py b/src/engine/SCons/Tool/ToolTests.py
index 779aaaad..adcd40ad 100644
--- a/src/engine/SCons/Tool/ToolTests.py
+++ b/src/engine/SCons/Tool/ToolTests.py
@@ -76,3 +76,9 @@ if __name__ == "__main__":
     suite = unittest.makeSuite(ToolTestCase, 'test_')
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index 7309a356..4c00ebc9 100644
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -665,3 +665,9 @@ def tool_list(platform, env):
              + other_tools)
 
     return filter(lambda x: x, tools)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/aixc++.py b/src/engine/SCons/Tool/aixc++.py
index 91aa92e7..5aa1eeec 100644
--- a/src/engine/SCons/Tool/aixc++.py
+++ b/src/engine/SCons/Tool/aixc++.py
@@ -74,3 +74,9 @@ def exists(env):
         if os.path.exists(xlc):
             return xlc
     return None
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/aixcc.py b/src/engine/SCons/Tool/aixcc.py
index bf7a6b3d..9668f799 100644
--- a/src/engine/SCons/Tool/aixcc.py
+++ b/src/engine/SCons/Tool/aixcc.py
@@ -66,3 +66,9 @@ def exists(env):
         if os.path.exists(xlc):
             return xlc
     return None
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/aixf77.py b/src/engine/SCons/Tool/aixf77.py
index 8e612cd6..a667e843 100644
--- a/src/engine/SCons/Tool/aixf77.py
+++ b/src/engine/SCons/Tool/aixf77.py
@@ -72,3 +72,9 @@ def exists(env):
         if os.path.exists(xlf77):
             return xlf77
     return None
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/aixlink.py b/src/engine/SCons/Tool/aixlink.py
index 5c3b383c..35125220 100644
--- a/src/engine/SCons/Tool/aixlink.py
+++ b/src/engine/SCons/Tool/aixlink.py
@@ -68,3 +68,9 @@ def exists(env):
         if os.path.exists(xlc):
             return xlc
     return None
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/applelink.py b/src/engine/SCons/Tool/applelink.py
index 0a7a1854..19390982 100644
--- a/src/engine/SCons/Tool/applelink.py
+++ b/src/engine/SCons/Tool/applelink.py
@@ -63,3 +63,9 @@ def generate(env):
 
 def exists(env):
     return env['PLATFORM'] == 'darwin'
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/ar.py b/src/engine/SCons/Tool/ar.py
index 913da5fd..0c3ac093 100644
--- a/src/engine/SCons/Tool/ar.py
+++ b/src/engine/SCons/Tool/ar.py
@@ -55,3 +55,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('ar')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/as.py b/src/engine/SCons/Tool/as.py
index 100e68bb..c7482513 100644
--- a/src/engine/SCons/Tool/as.py
+++ b/src/engine/SCons/Tool/as.py
@@ -70,3 +70,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(assemblers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/bcc32.py b/src/engine/SCons/Tool/bcc32.py
index 517ea29e..023ad22d 100644
--- a/src/engine/SCons/Tool/bcc32.py
+++ b/src/engine/SCons/Tool/bcc32.py
@@ -74,3 +74,9 @@ def generate(env):
 
 def exists(env):
     return findIt('bcc32', env)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/c++.py b/src/engine/SCons/Tool/c++.py
index f360ed82..82a19c5e 100644
--- a/src/engine/SCons/Tool/c++.py
+++ b/src/engine/SCons/Tool/c++.py
@@ -91,3 +91,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(compilers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/cc.py b/src/engine/SCons/Tool/cc.py
index bccd8218..da169fed 100644
--- a/src/engine/SCons/Tool/cc.py
+++ b/src/engine/SCons/Tool/cc.py
@@ -106,3 +106,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('cc')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/cvf.py b/src/engine/SCons/Tool/cvf.py
index 4bca52bb..2a28e6a9 100644
--- a/src/engine/SCons/Tool/cvf.py
+++ b/src/engine/SCons/Tool/cvf.py
@@ -50,3 +50,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(compilers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/default.py b/src/engine/SCons/Tool/default.py
index fd77229d..a36e9ec1 100644
--- a/src/engine/SCons/Tool/default.py
+++ b/src/engine/SCons/Tool/default.py
@@ -42,3 +42,9 @@ def generate(env):
 
 def exists(env):
     return 1
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/dmd.py b/src/engine/SCons/Tool/dmd.py
index 53432c6f..5aecfaca 100644
--- a/src/engine/SCons/Tool/dmd.py
+++ b/src/engine/SCons/Tool/dmd.py
@@ -216,3 +216,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(['dmd', 'gdmd'])
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/dvi.py b/src/engine/SCons/Tool/dvi.py
index 78fb4c2d..4067b2a1 100644
--- a/src/engine/SCons/Tool/dvi.py
+++ b/src/engine/SCons/Tool/dvi.py
@@ -56,3 +56,9 @@ def exists(env):
     # This only puts a skeleton Builder in place, so if someone
     # references this Tool directly, it's always "available."
     return 1
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/dvipdf.py b/src/engine/SCons/Tool/dvipdf.py
index 00086baa..80a4b07f 100644
--- a/src/engine/SCons/Tool/dvipdf.py
+++ b/src/engine/SCons/Tool/dvipdf.py
@@ -117,3 +117,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('dvipdf')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/dvips.py b/src/engine/SCons/Tool/dvips.py
index 20dcc946..c682a210 100644
--- a/src/engine/SCons/Tool/dvips.py
+++ b/src/engine/SCons/Tool/dvips.py
@@ -86,3 +86,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('dvips')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/f77.py b/src/engine/SCons/Tool/f77.py
index c8da35aa..af47024b 100644
--- a/src/engine/SCons/Tool/f77.py
+++ b/src/engine/SCons/Tool/f77.py
@@ -54,3 +54,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(compilers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/f90.py b/src/engine/SCons/Tool/f90.py
index 4eb8f7c3..16b8f843 100644
--- a/src/engine/SCons/Tool/f90.py
+++ b/src/engine/SCons/Tool/f90.py
@@ -54,3 +54,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(compilers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/f95.py b/src/engine/SCons/Tool/f95.py
index 545894a7..5ce5e570 100644
--- a/src/engine/SCons/Tool/f95.py
+++ b/src/engine/SCons/Tool/f95.py
@@ -55,3 +55,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(compilers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/filesystem.py b/src/engine/SCons/Tool/filesystem.py
index 46aefbb2..4cecb126 100644
--- a/src/engine/SCons/Tool/filesystem.py
+++ b/src/engine/SCons/Tool/filesystem.py
@@ -90,3 +90,9 @@ def generate(env):
 
 def exists(env):
     return 1
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/fortran.py b/src/engine/SCons/Tool/fortran.py
index d81ba45a..b944ca2a 100644
--- a/src/engine/SCons/Tool/fortran.py
+++ b/src/engine/SCons/Tool/fortran.py
@@ -55,3 +55,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(compilers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/g++.py b/src/engine/SCons/Tool/g++.py
index b492604b..e4da5fe2 100644
--- a/src/engine/SCons/Tool/g++.py
+++ b/src/engine/SCons/Tool/g++.py
@@ -82,3 +82,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(compilers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/g77.py b/src/engine/SCons/Tool/g77.py
index 66d3d89e..9dc3ba5c 100644
--- a/src/engine/SCons/Tool/g77.py
+++ b/src/engine/SCons/Tool/g77.py
@@ -65,3 +65,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(compilers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/gas.py b/src/engine/SCons/Tool/gas.py
index e44a28dd..28f84db7 100644
--- a/src/engine/SCons/Tool/gas.py
+++ b/src/engine/SCons/Tool/gas.py
@@ -45,3 +45,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(assemblers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/gcc.py b/src/engine/SCons/Tool/gcc.py
index d0741917..71f60a3e 100644
--- a/src/engine/SCons/Tool/gcc.py
+++ b/src/engine/SCons/Tool/gcc.py
@@ -72,3 +72,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(compilers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/gfortran.py b/src/engine/SCons/Tool/gfortran.py
index 72f38eec..63414e3d 100644
--- a/src/engine/SCons/Tool/gfortran.py
+++ b/src/engine/SCons/Tool/gfortran.py
@@ -56,3 +56,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('gfortran')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/gnulink.py b/src/engine/SCons/Tool/gnulink.py
index dbd0c54c..14720212 100644
--- a/src/engine/SCons/Tool/gnulink.py
+++ b/src/engine/SCons/Tool/gnulink.py
@@ -55,3 +55,9 @@ def generate(env):
     
 def exists(env):
     return env.Detect(linkers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/gs.py b/src/engine/SCons/Tool/gs.py
index b8e9c6f9..591eef0d 100644
--- a/src/engine/SCons/Tool/gs.py
+++ b/src/engine/SCons/Tool/gs.py
@@ -73,3 +73,9 @@ def exists(env):
         return env.Detect(env['PS2PDF'])
     else:
         return env.Detect(gs) or SCons.Util.WhereIs(gs)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/hpc++.py b/src/engine/SCons/Tool/hpc++.py
index 8c4b4ddb..e1a00407 100644
--- a/src/engine/SCons/Tool/hpc++.py
+++ b/src/engine/SCons/Tool/hpc++.py
@@ -77,3 +77,9 @@ def generate(env):
 
 def exists(env):
     return acc
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/hpcc.py b/src/engine/SCons/Tool/hpcc.py
index 15f23dc7..30f49648 100644
--- a/src/engine/SCons/Tool/hpcc.py
+++ b/src/engine/SCons/Tool/hpcc.py
@@ -45,3 +45,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('aCC')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/hplink.py b/src/engine/SCons/Tool/hplink.py
index 5921b39d..17dbe057 100644
--- a/src/engine/SCons/Tool/hplink.py
+++ b/src/engine/SCons/Tool/hplink.py
@@ -69,3 +69,9 @@ def generate(env):
 
 def exists(env):
     return ccLinker
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/icc.py b/src/engine/SCons/Tool/icc.py
index 90dece72..db156422 100644
--- a/src/engine/SCons/Tool/icc.py
+++ b/src/engine/SCons/Tool/icc.py
@@ -51,3 +51,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('icc')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/icl.py b/src/engine/SCons/Tool/icl.py
index 8d7aea74..2d1636e9 100644
--- a/src/engine/SCons/Tool/icl.py
+++ b/src/engine/SCons/Tool/icl.py
@@ -44,3 +44,9 @@ def generate(*args, **kw):
 
 def exists(*args, **kw):
     return apply(SCons.Tool.intelc.exists, args, kw)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/ifl.py b/src/engine/SCons/Tool/ifl.py
index b3a3fc82..88dcf598 100644
--- a/src/engine/SCons/Tool/ifl.py
+++ b/src/engine/SCons/Tool/ifl.py
@@ -64,3 +64,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('ifl')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/ifort.py b/src/engine/SCons/Tool/ifort.py
index deb0ee34..be5f54dd 100644
--- a/src/engine/SCons/Tool/ifort.py
+++ b/src/engine/SCons/Tool/ifort.py
@@ -81,3 +81,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('ifort')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/ilink.py b/src/engine/SCons/Tool/ilink.py
index 180e57a0..17c43a14 100644
--- a/src/engine/SCons/Tool/ilink.py
+++ b/src/engine/SCons/Tool/ilink.py
@@ -51,3 +51,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('ilink')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/ilink32.py b/src/engine/SCons/Tool/ilink32.py
index d6ddc9d5..1452fd55 100644
--- a/src/engine/SCons/Tool/ilink32.py
+++ b/src/engine/SCons/Tool/ilink32.py
@@ -52,3 +52,9 @@ def exists(env):
     # Uses bcc32 to do linking as it generally knows where the standard
     # LIBS are and set up the linking correctly
     return SCons.Tool.bcc32.findIt('bcc32', env)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/install.py b/src/engine/SCons/Tool/install.py
index 983fb123..06bcfdd1 100644
--- a/src/engine/SCons/Tool/install.py
+++ b/src/engine/SCons/Tool/install.py
@@ -221,3 +221,9 @@ def generate(env):
 
 def exists(env):
     return 1
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/intelc.py b/src/engine/SCons/Tool/intelc.py
index d6f19c2d..202c2a4b 100644
--- a/src/engine/SCons/Tool/intelc.py
+++ b/src/engine/SCons/Tool/intelc.py
@@ -480,3 +480,9 @@ def exists(env):
     return detected
 
 # end of file
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/ipkg.py b/src/engine/SCons/Tool/ipkg.py
index 3f6ca23b..755c5367 100644
--- a/src/engine/SCons/Tool/ipkg.py
+++ b/src/engine/SCons/Tool/ipkg.py
@@ -59,3 +59,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('ipkg-build')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/jar.py b/src/engine/SCons/Tool/jar.py
index 7018c37d..05cac49f 100644
--- a/src/engine/SCons/Tool/jar.py
+++ b/src/engine/SCons/Tool/jar.py
@@ -102,3 +102,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('jar')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/javac.py b/src/engine/SCons/Tool/javac.py
index cb79301e..78d641a5 100644
--- a/src/engine/SCons/Tool/javac.py
+++ b/src/engine/SCons/Tool/javac.py
@@ -226,3 +226,9 @@ def generate(env):
 
 def exists(env):
     return 1
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/javah.py b/src/engine/SCons/Tool/javah.py
index 9b3c8c22..dda5ebbb 100644
--- a/src/engine/SCons/Tool/javah.py
+++ b/src/engine/SCons/Tool/javah.py
@@ -130,3 +130,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('javah')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/latex.py b/src/engine/SCons/Tool/latex.py
index e5e15d0d..234d3c0d 100644
--- a/src/engine/SCons/Tool/latex.py
+++ b/src/engine/SCons/Tool/latex.py
@@ -74,3 +74,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('latex')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/lex.py b/src/engine/SCons/Tool/lex.py
index e599f8ae..dd7fe25b 100644
--- a/src/engine/SCons/Tool/lex.py
+++ b/src/engine/SCons/Tool/lex.py
@@ -91,3 +91,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(["flex", "lex"])
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py
index d0fe86c9..e54a075d 100644
--- a/src/engine/SCons/Tool/link.py
+++ b/src/engine/SCons/Tool/link.py
@@ -113,3 +113,9 @@ def exists(env):
     # This module isn't really a Tool on its own, it's common logic for
     # other linkers.
     return None
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/linkloc.py b/src/engine/SCons/Tool/linkloc.py
index f5256c96..6b9be12c 100644
--- a/src/engine/SCons/Tool/linkloc.py
+++ b/src/engine/SCons/Tool/linkloc.py
@@ -103,3 +103,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('linkloc')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/m4.py b/src/engine/SCons/Tool/m4.py
index 06757bf7..8506784d 100644
--- a/src/engine/SCons/Tool/m4.py
+++ b/src/engine/SCons/Tool/m4.py
@@ -55,3 +55,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('m4')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/masm.py b/src/engine/SCons/Tool/masm.py
index d3a525fd..b9d88cd1 100644
--- a/src/engine/SCons/Tool/masm.py
+++ b/src/engine/SCons/Tool/masm.py
@@ -69,3 +69,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('ml')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/midl.py b/src/engine/SCons/Tool/midl.py
index a0257011..8347bc1c 100644
--- a/src/engine/SCons/Tool/midl.py
+++ b/src/engine/SCons/Tool/midl.py
@@ -88,3 +88,9 @@ def exists(env):
         return 1
     else:
         return env.Detect('midl')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py
index a05ddc7c..da8a59e6 100644
--- a/src/engine/SCons/Tool/mingw.py
+++ b/src/engine/SCons/Tool/mingw.py
@@ -151,3 +151,9 @@ def generate(env):
 
 def exists(env):
     return find(env)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/mslib.py b/src/engine/SCons/Tool/mslib.py
index ee4ee862..dcb57fa1 100644
--- a/src/engine/SCons/Tool/mslib.py
+++ b/src/engine/SCons/Tool/mslib.py
@@ -74,3 +74,9 @@ def exists(env):
     else:
         # there's at least one version of MSVS installed.
         return 1
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/mslink.py b/src/engine/SCons/Tool/mslink.py
index 53cab28c..2b9c5f88 100644
--- a/src/engine/SCons/Tool/mslink.py
+++ b/src/engine/SCons/Tool/mslink.py
@@ -278,3 +278,9 @@ def exists(env):
         # think Visual Studio is installed.
         return env.Detect('link')
     return None
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py
index 09752b3c..19ebd9f1 100644
--- a/src/engine/SCons/Tool/msvc.py
+++ b/src/engine/SCons/Tool/msvc.py
@@ -827,3 +827,8 @@ def exists(env):
     else:
         return env.Detect('cl')
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py
index e08a167c..b5e6651c 100644
--- a/src/engine/SCons/Tool/msvs.py
+++ b/src/engine/SCons/Tool/msvs.py
@@ -1817,3 +1817,9 @@ def exists(env):
     else:
         # there's at least one version of MSVS installed.
         return 1
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/msvsTests.py b/src/engine/SCons/Tool/msvsTests.py
index 82962871..40c6af60 100644
--- a/src/engine/SCons/Tool/msvsTests.py
+++ b/src/engine/SCons/Tool/msvsTests.py
@@ -634,3 +634,9 @@ if __name__ == "__main__":
             exit_val = 1
 
     sys.exit(exit_val)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/mwcc.py b/src/engine/SCons/Tool/mwcc.py
index 0d5ce82e..e83043fe 100644
--- a/src/engine/SCons/Tool/mwcc.py
+++ b/src/engine/SCons/Tool/mwcc.py
@@ -200,3 +200,9 @@ def generate(env):
 
 def exists(env):
     return set_vars(env)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/mwld.py b/src/engine/SCons/Tool/mwld.py
index e73c730a..e84b8127 100644
--- a/src/engine/SCons/Tool/mwld.py
+++ b/src/engine/SCons/Tool/mwld.py
@@ -99,3 +99,9 @@ def shlib_emitter(target, source, env):
 
 
 shlib_action = SCons.Action.Action(shlib_generator, generator=1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/nasm.py b/src/engine/SCons/Tool/nasm.py
index f1b0e550..ff0bc612 100644
--- a/src/engine/SCons/Tool/nasm.py
+++ b/src/engine/SCons/Tool/nasm.py
@@ -64,3 +64,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('nasm')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/packaging/__init__.py b/src/engine/SCons/Tool/packaging/__init__.py
index 3854fea3..c4ae1702 100644
--- a/src/engine/SCons/Tool/packaging/__init__.py
+++ b/src/engine/SCons/Tool/packaging/__init__.py
@@ -306,3 +306,9 @@ def stripinstallbuilder(target, source, env):
                 setattr(ss, 'PACKAGING_INSTALL_LOCATION', s.get_path())
 
     return (target, n_source)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/packaging/ipk.py b/src/engine/SCons/Tool/packaging/ipk.py
index e3ae2775..8575de6c 100644
--- a/src/engine/SCons/Tool/packaging/ipk.py
+++ b/src/engine/SCons/Tool/packaging/ipk.py
@@ -177,3 +177,9 @@ Description: $X_IPK_DESCRIPTION
         content += env['CHANGE_SPECFILE'](target)
 
     return 0
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/packaging/msi.py b/src/engine/SCons/Tool/packaging/msi.py
index 1ce2b1a3..d2bef8e6 100644
--- a/src/engine/SCons/Tool/packaging/msi.py
+++ b/src/engine/SCons/Tool/packaging/msi.py
@@ -519,3 +519,8 @@ def package(env, target, source, PACKAGEROOT, NAME, VERSION,
     # return the target and source tuple.
     return (msifile, source+[specfile])
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/packaging/rpm.py b/src/engine/SCons/Tool/packaging/rpm.py
index 5f976088..c2a532c4 100644
--- a/src/engine/SCons/Tool/packaging/rpm.py
+++ b/src/engine/SCons/Tool/packaging/rpm.py
@@ -360,3 +360,8 @@ class SimpleTagCompiler:
 
         return str
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/packaging/src_tarbz2.py b/src/engine/SCons/Tool/packaging/src_tarbz2.py
index 83231072..04ea71bb 100644
--- a/src/engine/SCons/Tool/packaging/src_tarbz2.py
+++ b/src/engine/SCons/Tool/packaging/src_tarbz2.py
@@ -35,3 +35,9 @@ def package(env, target, source, PACKAGEROOT, **kw):
     bld.set_suffix('.tar.bz2')
     target, source = putintopackageroot(target, source, env, PACKAGEROOT, honor_install_location=0)
     return bld(env, target, source, TARFLAGS='-jc')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/packaging/src_targz.py b/src/engine/SCons/Tool/packaging/src_targz.py
index db512798..62d6f5dc 100644
--- a/src/engine/SCons/Tool/packaging/src_targz.py
+++ b/src/engine/SCons/Tool/packaging/src_targz.py
@@ -35,3 +35,9 @@ def package(env, target, source, PACKAGEROOT, **kw):
     bld.set_suffix('.tar.gz')
     target, source = putintopackageroot(target, source, env, PACKAGEROOT, honor_install_location=0)
     return bld(env, target, source, TARFLAGS='-zc')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/packaging/src_zip.py b/src/engine/SCons/Tool/packaging/src_zip.py
index 01bd42e7..3df73970 100644
--- a/src/engine/SCons/Tool/packaging/src_zip.py
+++ b/src/engine/SCons/Tool/packaging/src_zip.py
@@ -35,3 +35,9 @@ def package(env, target, source, PACKAGEROOT, **kw):
     bld.set_suffix('.zip')
     target, source = putintopackageroot(target, source, env, PACKAGEROOT, honor_install_location=0)
     return bld(env, target, source)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/packaging/tarbz2.py b/src/engine/SCons/Tool/packaging/tarbz2.py
index 52252da4..2e38da25 100644
--- a/src/engine/SCons/Tool/packaging/tarbz2.py
+++ b/src/engine/SCons/Tool/packaging/tarbz2.py
@@ -36,3 +36,9 @@ def package(env, target, source, PACKAGEROOT, **kw):
     target, source = putintopackageroot(target, source, env, PACKAGEROOT)
     target, source = stripinstallbuilder(target, source, env)
     return bld(env, target, source, TARFLAGS='-jc')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/packaging/targz.py b/src/engine/SCons/Tool/packaging/targz.py
index 47138406..acb6344c 100644
--- a/src/engine/SCons/Tool/packaging/targz.py
+++ b/src/engine/SCons/Tool/packaging/targz.py
@@ -36,3 +36,9 @@ def package(env, target, source, PACKAGEROOT, **kw):
     target, source = stripinstallbuilder(target, source, env)
     target, source = putintopackageroot(target, source, env, PACKAGEROOT)
     return bld(env, target, source, TARFLAGS='-zc')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/packaging/zip.py b/src/engine/SCons/Tool/packaging/zip.py
index 639d5691..1f76f160 100644
--- a/src/engine/SCons/Tool/packaging/zip.py
+++ b/src/engine/SCons/Tool/packaging/zip.py
@@ -36,3 +36,9 @@ def package(env, target, source, PACKAGEROOT, **kw):
     target, source = stripinstallbuilder(target, source, env)
     target, source = putintopackageroot(target, source, env, PACKAGEROOT)
     return bld(env, target, source)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/pdf.py b/src/engine/SCons/Tool/pdf.py
index d94db05e..b98be585 100644
--- a/src/engine/SCons/Tool/pdf.py
+++ b/src/engine/SCons/Tool/pdf.py
@@ -70,3 +70,9 @@ def exists(env):
     # This only puts a skeleton Builder in place, so if someone
     # references this Tool directly, it's always "available."
     return 1
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/pdflatex.py b/src/engine/SCons/Tool/pdflatex.py
index 010fa11c..6c37b467 100644
--- a/src/engine/SCons/Tool/pdflatex.py
+++ b/src/engine/SCons/Tool/pdflatex.py
@@ -73,3 +73,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('pdflatex')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/pdftex.py b/src/engine/SCons/Tool/pdftex.py
index a9d3f589..308cb71d 100644
--- a/src/engine/SCons/Tool/pdftex.py
+++ b/src/engine/SCons/Tool/pdftex.py
@@ -97,3 +97,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('pdftex')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/qt.py b/src/engine/SCons/Tool/qt.py
index e2aa4415..9cc30390 100644
--- a/src/engine/SCons/Tool/qt.py
+++ b/src/engine/SCons/Tool/qt.py
@@ -328,3 +328,9 @@ def generate(env):
 
 def exists(env):
     return _detect(env)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/rmic.py b/src/engine/SCons/Tool/rmic.py
index ed5c8ee7..8720d3dd 100644
--- a/src/engine/SCons/Tool/rmic.py
+++ b/src/engine/SCons/Tool/rmic.py
@@ -113,3 +113,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('rmic')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/rpcgen.py b/src/engine/SCons/Tool/rpcgen.py
index e040f074..4af59657 100644
--- a/src/engine/SCons/Tool/rpcgen.py
+++ b/src/engine/SCons/Tool/rpcgen.py
@@ -62,3 +62,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('rpcgen')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/rpm.py b/src/engine/SCons/Tool/rpm.py
index adb9de1e..26d21099 100644
--- a/src/engine/SCons/Tool/rpm.py
+++ b/src/engine/SCons/Tool/rpm.py
@@ -124,3 +124,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('rpmbuild')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/sgiar.py b/src/engine/SCons/Tool/sgiar.py
index 010f0906..54f8b7b6 100644
--- a/src/engine/SCons/Tool/sgiar.py
+++ b/src/engine/SCons/Tool/sgiar.py
@@ -60,3 +60,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('CC') or env.Detect('ar')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/sgic++.py b/src/engine/SCons/Tool/sgic++.py
index 65d31b3f..35547ac9 100644
--- a/src/engine/SCons/Tool/sgic++.py
+++ b/src/engine/SCons/Tool/sgic++.py
@@ -50,3 +50,9 @@ def generate(env):
     
 def exists(env):
     return env.Detect('CC')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/sgicc.py b/src/engine/SCons/Tool/sgicc.py
index da2c26d9..662eb7dd 100644
--- a/src/engine/SCons/Tool/sgicc.py
+++ b/src/engine/SCons/Tool/sgicc.py
@@ -45,3 +45,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('cc')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/sgilink.py b/src/engine/SCons/Tool/sgilink.py
index 85d9e306..1c32ad06 100644
--- a/src/engine/SCons/Tool/sgilink.py
+++ b/src/engine/SCons/Tool/sgilink.py
@@ -55,3 +55,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(linkers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/sunar.py b/src/engine/SCons/Tool/sunar.py
index 66053e7c..779414fd 100644
--- a/src/engine/SCons/Tool/sunar.py
+++ b/src/engine/SCons/Tool/sunar.py
@@ -59,3 +59,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('CC') or env.Detect('ar')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/sunc++.py b/src/engine/SCons/Tool/sunc++.py
index 7ef3e023..c27627c0 100644
--- a/src/engine/SCons/Tool/sunc++.py
+++ b/src/engine/SCons/Tool/sunc++.py
@@ -98,3 +98,9 @@ def exists(env):
         if os.path.exists(cppc):
             return cppc
     return None
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/suncc.py b/src/engine/SCons/Tool/suncc.py
index 35d2aca1..458538b4 100644
--- a/src/engine/SCons/Tool/suncc.py
+++ b/src/engine/SCons/Tool/suncc.py
@@ -50,3 +50,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('CC')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/sunf77.py b/src/engine/SCons/Tool/sunf77.py
index 4c2fe1cb..d05ce541 100644
--- a/src/engine/SCons/Tool/sunf77.py
+++ b/src/engine/SCons/Tool/sunf77.py
@@ -55,3 +55,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(compilers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/sunf90.py b/src/engine/SCons/Tool/sunf90.py
index 92aecc64..93b89c00 100644
--- a/src/engine/SCons/Tool/sunf90.py
+++ b/src/engine/SCons/Tool/sunf90.py
@@ -56,3 +56,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(compilers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/sunf95.py b/src/engine/SCons/Tool/sunf95.py
index 8e02655d..c09026ca 100644
--- a/src/engine/SCons/Tool/sunf95.py
+++ b/src/engine/SCons/Tool/sunf95.py
@@ -56,3 +56,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(compilers)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/sunlink.py b/src/engine/SCons/Tool/sunlink.py
index 665d6566..ab66f468 100644
--- a/src/engine/SCons/Tool/sunlink.py
+++ b/src/engine/SCons/Tool/sunlink.py
@@ -69,3 +69,9 @@ def generate(env):
 
 def exists(env):
     return ccLinker
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/swig.py b/src/engine/SCons/Tool/swig.py
index eff88062..b62d5938 100644
--- a/src/engine/SCons/Tool/swig.py
+++ b/src/engine/SCons/Tool/swig.py
@@ -147,3 +147,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(['swig'])
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/tar.py b/src/engine/SCons/Tool/tar.py
index 58b75547..25937811 100644
--- a/src/engine/SCons/Tool/tar.py
+++ b/src/engine/SCons/Tool/tar.py
@@ -65,3 +65,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(tars)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/tex.py b/src/engine/SCons/Tool/tex.py
index 1e78bb5a..e0353b91 100644
--- a/src/engine/SCons/Tool/tex.py
+++ b/src/engine/SCons/Tool/tex.py
@@ -638,3 +638,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect('tex')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/tlib.py b/src/engine/SCons/Tool/tlib.py
index ec80a214..33adb576 100644
--- a/src/engine/SCons/Tool/tlib.py
+++ b/src/engine/SCons/Tool/tlib.py
@@ -45,3 +45,9 @@ def generate(env):
 
 def exists(env):
     return SCons.Tool.bcc32.findIt('tlib', env)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/wix.py b/src/engine/SCons/Tool/wix.py
index 8d6d3fdb..5737df21 100644
--- a/src/engine/SCons/Tool/wix.py
+++ b/src/engine/SCons/Tool/wix.py
@@ -92,3 +92,9 @@ def exists(env):
             pass # ignore this, could be a stale PATH entry.
 
     return None
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/yacc.py b/src/engine/SCons/Tool/yacc.py
index 3d13dd0e..4d551e6b 100644
--- a/src/engine/SCons/Tool/yacc.py
+++ b/src/engine/SCons/Tool/yacc.py
@@ -123,3 +123,9 @@ def generate(env):
 
 def exists(env):
     return env.Detect(['bison', 'yacc'])
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Tool/zip.py b/src/engine/SCons/Tool/zip.py
index 22f63fbb..ce0b2fcc 100644
--- a/src/engine/SCons/Tool/zip.py
+++ b/src/engine/SCons/Tool/zip.py
@@ -92,3 +92,9 @@ def generate(env):
 
 def exists(env):
     return internal_zip or env.Detect('zip')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index d395ca8b..d0f08a69 100644
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -1591,3 +1591,9 @@ class NullSeq(Null):
 
 
 del __revision__
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/UtilTests.py b/src/engine/SCons/UtilTests.py
index 483591f6..b76ba997 100644
--- a/src/engine/SCons/UtilTests.py
+++ b/src/engine/SCons/UtilTests.py
@@ -784,3 +784,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Variables/BoolVariable.py b/src/engine/SCons/Variables/BoolVariable.py
index dd162cc1..c1a20e39 100644
--- a/src/engine/SCons/Variables/BoolVariable.py
+++ b/src/engine/SCons/Variables/BoolVariable.py
@@ -83,3 +83,9 @@ def BoolVariable(key, help, default):
     """
     return (key, '%s (yes|no)' % help, default,
             _validator, _text2bool)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Variables/BoolVariableTests.py b/src/engine/SCons/Variables/BoolVariableTests.py
index ef681508..88f64ed1 100644
--- a/src/engine/SCons/Variables/BoolVariableTests.py
+++ b/src/engine/SCons/Variables/BoolVariableTests.py
@@ -119,3 +119,9 @@ if __name__ == "__main__":
     suite = unittest.makeSuite(BoolVariableTestCase, 'test_')
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Variables/EnumVariable.py b/src/engine/SCons/Variables/EnumVariable.py
index e1b20d2c..b8f30bf5 100644
--- a/src/engine/SCons/Variables/EnumVariable.py
+++ b/src/engine/SCons/Variables/EnumVariable.py
@@ -99,3 +99,9 @@ def EnumVariable(key, help, default, allowed_values, map={}, ignorecase=0):
         converter = lambda val, map=map: \
                     map.get(val, val)
     return (key, help, default, validator, converter)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Variables/EnumVariableTests.py b/src/engine/SCons/Variables/EnumVariableTests.py
index 0f9afdec..cc9289a6 100644
--- a/src/engine/SCons/Variables/EnumVariableTests.py
+++ b/src/engine/SCons/Variables/EnumVariableTests.py
@@ -196,3 +196,9 @@ if __name__ == "__main__":
     suite = unittest.makeSuite(EnumVariableTestCase, 'test_')
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Variables/ListVariable.py b/src/engine/SCons/Variables/ListVariable.py
index 37e30944..521fa4f9 100644
--- a/src/engine/SCons/Variables/ListVariable.py
+++ b/src/engine/SCons/Variables/ListVariable.py
@@ -131,3 +131,9 @@ def ListVariable(key, help, default, names, map={}):
     return (key, help, default,
             None, #_validator,
             lambda val, elems=names, m=map: _converter(val, elems, m))
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Variables/ListVariableTests.py b/src/engine/SCons/Variables/ListVariableTests.py
index 9363f6d5..4959f691 100644
--- a/src/engine/SCons/Variables/ListVariableTests.py
+++ b/src/engine/SCons/Variables/ListVariableTests.py
@@ -126,3 +126,9 @@ if __name__ == "__main__":
     suite = unittest.makeSuite(ListVariableTestCase, 'test_')
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Variables/PackageVariable.py b/src/engine/SCons/Variables/PackageVariable.py
index bf74aadb..294a3988 100644
--- a/src/engine/SCons/Variables/PackageVariable.py
+++ b/src/engine/SCons/Variables/PackageVariable.py
@@ -101,3 +101,9 @@ def PackageVariable(key, help, default, searchfunc=None):
     return (key, help, default,
             lambda k, v, e, f=searchfunc: _validator(k,v,e,f),
             _converter)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Variables/PackageVariableTests.py b/src/engine/SCons/Variables/PackageVariableTests.py
index 4adde2ea..190357ee 100644
--- a/src/engine/SCons/Variables/PackageVariableTests.py
+++ b/src/engine/SCons/Variables/PackageVariableTests.py
@@ -116,3 +116,9 @@ if __name__ == "__main__":
     suite = unittest.makeSuite(PackageVariableTestCase, 'test_')
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Variables/PathVariable.py b/src/engine/SCons/Variables/PathVariable.py
index e31de961..4052531e 100644
--- a/src/engine/SCons/Variables/PathVariable.py
+++ b/src/engine/SCons/Variables/PathVariable.py
@@ -139,3 +139,9 @@ class _PathVariableClass:
                     validator, None)
 
 PathVariable = _PathVariableClass()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Variables/PathVariableTests.py b/src/engine/SCons/Variables/PathVariableTests.py
index 980cc5ed..4e6436e9 100644
--- a/src/engine/SCons/Variables/PathVariableTests.py
+++ b/src/engine/SCons/Variables/PathVariableTests.py
@@ -229,3 +229,9 @@ if __name__ == "__main__":
     suite = unittest.makeSuite(PathVariableTestCase, 'test_')
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Variables/VariablesTests.py b/src/engine/SCons/Variables/VariablesTests.py
index cd6ab1d0..153b1aa6 100644
--- a/src/engine/SCons/Variables/VariablesTests.py
+++ b/src/engine/SCons/Variables/VariablesTests.py
@@ -550,3 +550,9 @@ if __name__ == "__main__":
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Variables/__init__.py b/src/engine/SCons/Variables/__init__.py
index 5a4a5573..e7b43160 100644
--- a/src/engine/SCons/Variables/__init__.py
+++ b/src/engine/SCons/Variables/__init__.py
@@ -302,3 +302,8 @@ class Variables:
         else:
             return self.format_ % (key, help, default, actual, aliases)
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/Warnings.py b/src/engine/SCons/Warnings.py
index e23d1efa..bfc01b33 100644
--- a/src/engine/SCons/Warnings.py
+++ b/src/engine/SCons/Warnings.py
@@ -209,3 +209,9 @@ def process_warn_strings(arguments):
                 sys.stderr.write(fmt % arg)
             else:
                 suppressWarningClass(clazz)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/WarningsTests.py b/src/engine/SCons/WarningsTests.py
index 228c82c5..83e11fca 100644
--- a/src/engine/SCons/WarningsTests.py
+++ b/src/engine/SCons/WarningsTests.py
@@ -127,3 +127,9 @@ if __name__ == "__main__":
     suite = unittest.makeSuite(WarningsTestCase, 'test_')
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/__init__.py b/src/engine/SCons/__init__.py
index 86af342f..1cbe18b2 100644
--- a/src/engine/SCons/__init__.py
+++ b/src/engine/SCons/__init__.py
@@ -41,3 +41,9 @@ __developer__ = "__DEVELOPER__"
 
 # make sure compatibility is always in place
 import SCons.compat
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/compat/__init__.py b/src/engine/SCons/compat/__init__.py
index cc48ce3d..542d31e5 100644
--- a/src/engine/SCons/compat/__init__.py
+++ b/src/engine/SCons/compat/__init__.py
@@ -242,3 +242,9 @@ try:
 except ImportError:
     # Pre-1.6 Python has no UserString module.
     import_as('_scons_UserString', 'UserString')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/compat/_scons_UserString.py b/src/engine/SCons/compat/_scons_UserString.py
index 4adffa20..785a260a 100644
--- a/src/engine/SCons/compat/_scons_UserString.py
+++ b/src/engine/SCons/compat/_scons_UserString.py
@@ -90,3 +90,9 @@ class UserString:
     def __mul__(self, n):
         return self.__class__(self.data*n)
     __rmul__ = __mul__
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/compat/_scons_hashlib.py b/src/engine/SCons/compat/_scons_hashlib.py
index 9445ddba..7b84cb7b 100644
--- a/src/engine/SCons/compat/_scons_hashlib.py
+++ b/src/engine/SCons/compat/_scons_hashlib.py
@@ -83,3 +83,9 @@ new = md5obj
 
 def md5(string=''):
     return md5obj('md5', string)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/compat/_scons_itertools.py b/src/engine/SCons/compat/_scons_itertools.py
index 9720daf9..3d6cb862 100644
--- a/src/engine/SCons/compat/_scons_itertools.py
+++ b/src/engine/SCons/compat/_scons_itertools.py
@@ -116,3 +116,9 @@ def takewhile(predicate, iterable):
 
 def tee(*args, **kw):
     raise NotImplementedError
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/compat/_scons_optparse.py b/src/engine/SCons/compat/_scons_optparse.py
index 6b376875..386dfea6 100644
--- a/src/engine/SCons/compat/_scons_optparse.py
+++ b/src/engine/SCons/compat/_scons_optparse.py
@@ -1717,3 +1717,9 @@ def _match_abbrev(s, wordmap):
 # which will become a factory function when there are many Option
 # classes.
 make_option = Option
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/compat/_scons_sets.py b/src/engine/SCons/compat/_scons_sets.py
index 32a0dd64..12dbeadc 100644
--- a/src/engine/SCons/compat/_scons_sets.py
+++ b/src/engine/SCons/compat/_scons_sets.py
@@ -575,3 +575,9 @@ class _TemporarilyImmutableSet(BaseSet):
 
     def __hash__(self):
         return self._set._compute_hash()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/compat/_scons_sets15.py b/src/engine/SCons/compat/_scons_sets15.py
index 1fe5a4f7..bafa0095 100644
--- a/src/engine/SCons/compat/_scons_sets15.py
+++ b/src/engine/SCons/compat/_scons_sets15.py
@@ -168,3 +168,9 @@ class Set:
             return 1
         else:
             return 0
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/compat/_scons_shlex.py b/src/engine/SCons/compat/_scons_shlex.py
index d6c10357..9e30a010 100644
--- a/src/engine/SCons/compat/_scons_shlex.py
+++ b/src/engine/SCons/compat/_scons_shlex.py
@@ -317,3 +317,9 @@ if __name__ == '__main__':
             print "Token: " + repr(tt)
         else:
             break
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/compat/_scons_subprocess.py b/src/engine/SCons/compat/_scons_subprocess.py
index 68d0e4c8..49688254 100644
--- a/src/engine/SCons/compat/_scons_subprocess.py
+++ b/src/engine/SCons/compat/_scons_subprocess.py
@@ -1288,3 +1288,9 @@ if __name__ == "__main__":
         _demo_windows()
     else:
         _demo_posix()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/compat/_scons_textwrap.py b/src/engine/SCons/compat/_scons_textwrap.py
index 72ed9b9c..81781af3 100644
--- a/src/engine/SCons/compat/_scons_textwrap.py
+++ b/src/engine/SCons/compat/_scons_textwrap.py
@@ -374,3 +374,9 @@ def dedent(text):
             lines[i] = lines[i][margin:]
 
     return string.join(lines, '\n')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/compat/builtins.py b/src/engine/SCons/compat/builtins.py
index abac8576..19329f64 100644
--- a/src/engine/SCons/compat/builtins.py
+++ b/src/engine/SCons/compat/builtins.py
@@ -179,3 +179,9 @@ except NameError:
 #    object.__setattr__(str, 'lstrip', lstrip)
 #    object.__setattr__(str, 'rstrip', rstrip)
 #    object.__setattr__(str, 'strip', strip)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/cpp.py b/src/engine/SCons/cpp.py
index 8c75287d..a1601648 100644
--- a/src/engine/SCons/cpp.py
+++ b/src/engine/SCons/cpp.py
@@ -590,3 +590,9 @@ class DumbPreProcessor(PreProcessor):
             d[func] = d[func] = self.do_nothing
 
 del __revision__
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/cppTests.py b/src/engine/SCons/cppTests.py
index ed1479b3..1c83a130 100644
--- a/src/engine/SCons/cppTests.py
+++ b/src/engine/SCons/cppTests.py
@@ -703,3 +703,9 @@ if __name__ == '__main__':
         suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/dblite.py b/src/engine/SCons/dblite.py
index 437f05a3..6d4cfd58 100644
--- a/src/engine/SCons/dblite.py
+++ b/src/engine/SCons/dblite.py
@@ -217,3 +217,9 @@ def _exercise():
 
 if (__name__ == "__main__"):
   _exercise()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/SCons/exitfuncs.py b/src/engine/SCons/exitfuncs.py
index 943bbd88..d911b526 100644
--- a/src/engine/SCons/exitfuncs.py
+++ b/src/engine/SCons/exitfuncs.py
@@ -69,3 +69,9 @@ except AttributeError:
 sys.exitfunc = _run_exitfuncs
 
 del sys
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/engine/setup.py b/src/engine/setup.py
index 692b0a04..c8a55b3b 100644
--- a/src/engine/setup.py
+++ b/src/engine/setup.py
@@ -66,3 +66,9 @@ software.""",
 		  "SCons.Scanner",
 		  "SCons.Sig",
 		  "SCons.Script"])
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/script/scons-post-install.py b/src/script/scons-post-install.py
index a622a6ac..e8fad53b 100644
--- a/src/script/scons-post-install.py
+++ b/src/script/scons-post-install.py
@@ -74,3 +74,9 @@ if len(sys.argv) > 1:
         remove()
 
 sys.exit(0)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/script/scons-time.py b/src/script/scons-time.py
index 4c74411b..134124f6 100644
--- a/src/script/scons-time.py
+++ b/src/script/scons-time.py
@@ -1511,3 +1511,9 @@ if __name__ == '__main__':
         sys.exit(1)
 
     ST.execute_subcommand(args)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/script/scons.py b/src/script/scons.py
index 698c9b43..94ecccb2 100644
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -163,3 +163,9 @@ if __name__ == "__main__":
     # this does all the work, and calls sys.exit
     # with the proper exit status when done.
     SCons.Script.main()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/script/sconsign.py b/src/script/sconsign.py
index b9629a82..c45f5873 100644
--- a/src/script/sconsign.py
+++ b/src/script/sconsign.py
@@ -500,3 +500,9 @@ else:
             Do_SConsignDir(a)
 
 sys.exit(0)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/script/setup.py b/src/script/setup.py
index 1d0c8744..e2c83732 100644
--- a/src/script/setup.py
+++ b/src/script/setup.py
@@ -47,3 +47,9 @@ software.""",
       licence = "MIT, freely distributable",
       keywords = "scons, cons, make, build tool, make tool",
       scripts = ["scons"])
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/setup.py b/src/setup.py
index e1d4fabb..b494b7c5 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -418,3 +418,9 @@ apply(distutils.core.setup, (), arguments)
 
 if Installed:
     print string.join(Installed, '\n')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/test_aegistests.py b/src/test_aegistests.py
index 9d0be226..af290831 100644
--- a/src/test_aegistests.py
+++ b/src/test_aegistests.py
@@ -75,3 +75,9 @@ if test_files:
     test.fail_test(1)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/test_files.py b/src/test_files.py
index 1424c623..b4138533 100644
--- a/src/test_files.py
+++ b/src/test_files.py
@@ -98,3 +98,9 @@ if no_result:
     test.no_result(1)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/test_interrupts.py b/src/test_interrupts.py
index eee1f0ca..0876a015 100644
--- a/src/test_interrupts.py
+++ b/src/test_interrupts.py
@@ -138,3 +138,9 @@ for f in files:
 test.fail_test(uncaughtKeyboardInterrupt)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/test_pychecker.py b/src/test_pychecker.py
index 00325598..37eea4c4 100644
--- a/src/test_pychecker.py
+++ b/src/test_pychecker.py
@@ -139,3 +139,9 @@ if mismatches:
     test.fail_test()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/test_setup.py b/src/test_setup.py
index e2bb48b8..7454b569 100644
--- a/src/test_setup.py
+++ b/src/test_setup.py
@@ -327,3 +327,9 @@ test.fail_test(string.find(test.stderr(),
 
 # All done.
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/test_strings.py b/src/test_strings.py
index 0b6344f7..25f2370e 100644
--- a/src/test_strings.py
+++ b/src/test_strings.py
@@ -250,3 +250,9 @@ if not_built:
     test.no_result(1)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/template/Tests.py b/template/Tests.py
index d60835bb..4d62e0a8 100644
--- a/template/Tests.py
+++ b/template/Tests.py
@@ -24,3 +24,9 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import unittest
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/template/__init__.py b/template/__init__.py
index f483d38c..1399f0ba 100644
--- a/template/__init__.py
+++ b/template/__init__.py
@@ -30,3 +30,9 @@ XXX
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 __version__ = "__VERSION__"
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/template/file.py b/template/file.py
index c223e115..f506de44 100644
--- a/template/file.py
+++ b/template/file.py
@@ -32,3 +32,9 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 
 import XXX
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/template/test.py b/template/test.py
index 131c0198..0463cbff 100644
--- a/template/test.py
+++ b/template/test.py
@@ -39,3 +39,9 @@ env = Environment()
 test.run(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AR/AR.py b/test/AR/AR.py
index 40483400..2c0b1ae7 100644
--- a/test/AR/AR.py
+++ b/test/AR/AR.py
@@ -105,3 +105,9 @@ test.run(arguments = 'b' + _exe,
 test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AR/ARCOM.py b/test/AR/ARCOM.py
index 73c36fc7..65cae2e3 100644
--- a/test/AR/ARCOM.py
+++ b/test/AR/ARCOM.py
@@ -68,3 +68,9 @@ test.must_match('output.lib', "file.1\nfile.2\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AR/ARCOMSTR.py b/test/AR/ARCOMSTR.py
index f0a6158c..c4a8c779 100644
--- a/test/AR/ARCOMSTR.py
+++ b/test/AR/ARCOMSTR.py
@@ -72,3 +72,9 @@ test.must_match('output.lib', "file.1\nfile.2\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AR/ARFLAGS.py b/test/AR/ARFLAGS.py
index fbca0ff9..087cefeb 100644
--- a/test/AR/ARFLAGS.py
+++ b/test/AR/ARFLAGS.py
@@ -104,3 +104,9 @@ test.run(arguments = 'b' + _exe,
 test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ARGLIST.py b/test/ARGLIST.py
index c70ed8ea..186ad069 100644
--- a/test/ARGLIST.py
+++ b/test/ARGLIST.py
@@ -46,3 +46,9 @@ expect = test.wrap_stdout(read_str="""\
 test.run(arguments='a=1 bz=3 xx=sd zzz=foo=bar .', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ARGUMENTS.py b/test/ARGUMENTS.py
index 69947a66..c028372e 100644
--- a/test/ARGUMENTS.py
+++ b/test/ARGUMENTS.py
@@ -46,3 +46,9 @@ zzz = foo=bar
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/AS.py b/test/AS/AS.py
index e8a2a595..0857a629 100644
--- a/test/AS/AS.py
+++ b/test/AS/AS.py
@@ -172,3 +172,9 @@ test.must_match('test6' + _exe, "This is a .SPP file.\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ASCOM.py b/test/AS/ASCOM.py
index 6ad7e6e2..c2468066 100644
--- a/test/AS/ASCOM.py
+++ b/test/AS/ASCOM.py
@@ -91,3 +91,9 @@ test.fail_test(test.read('test8.shobj') != "test8.ASM\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ASCOMSTR.py b/test/AS/ASCOMSTR.py
index d146229c..f1f64ee3 100644
--- a/test/AS/ASCOMSTR.py
+++ b/test/AS/ASCOMSTR.py
@@ -85,3 +85,9 @@ test.fail_test(test.read('test4.obj') != "test4.ASM\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ASFLAGS.py b/test/AS/ASFLAGS.py
index 7297620d..d7b7c33c 100644
--- a/test/AS/ASFLAGS.py
+++ b/test/AS/ASFLAGS.py
@@ -182,3 +182,9 @@ test.must_match('test5' + _exe, "%s\nThis is a .spp file.\n" % o_c)
 test.must_match('test6' + _exe, "%s\nThis is a .SPP file.\n" % o_c)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ASPP.py b/test/AS/ASPP.py
index f2c3e44f..cb9d8dd9 100644
--- a/test/AS/ASPP.py
+++ b/test/AS/ASPP.py
@@ -136,3 +136,9 @@ test.fail_test(test.read('test2' + _exe) != "This is a .SPP file.\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ASPPCOM.py b/test/AS/ASPPCOM.py
index 6f2bde5d..b3c04a9f 100644
--- a/test/AS/ASPPCOM.py
+++ b/test/AS/ASPPCOM.py
@@ -71,3 +71,9 @@ test.fail_test(test.read('test4.shobj') != "test4.SPP\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ASPPCOMSTR.py b/test/AS/ASPPCOMSTR.py
index 37a61df7..0e612ad9 100644
--- a/test/AS/ASPPCOMSTR.py
+++ b/test/AS/ASPPCOMSTR.py
@@ -70,3 +70,9 @@ test.fail_test(test.read('test2.obj') != "test2.SPP\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ASPPFLAGS.py b/test/AS/ASPPFLAGS.py
index 2410435c..b8fdf2eb 100644
--- a/test/AS/ASPPFLAGS.py
+++ b/test/AS/ASPPFLAGS.py
@@ -149,3 +149,9 @@ test.must_match('test1' + _exe, "%s\nThis is a .spp file.\n" % o_c)
 test.must_match('test2' + _exe, "%s\nThis is a .SPP file.\n" % o_c)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/as-live.py b/test/AS/as-live.py
index 03c6f24a..0ee7c169 100644
--- a/test/AS/as-live.py
+++ b/test/AS/as-live.py
@@ -180,3 +180,9 @@ test.unlink('wrapper.out')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/ml.py b/test/AS/ml.py
index 633befd8..af7fc176 100644
--- a/test/AS/ml.py
+++ b/test/AS/ml.py
@@ -122,3 +122,9 @@ test.must_match('wrapper.out', "wrapper.py\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AS/nasm.py b/test/AS/nasm.py
index f1b99eee..b6d61a31 100644
--- a/test/AS/nasm.py
+++ b/test/AS/nasm.py
@@ -147,3 +147,9 @@ test.must_match('wrapper.out', "wrapper.py\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/actions.py b/test/Actions/actions.py
index 61c3c7d0..79da3858 100644
--- a/test/Actions/actions.py
+++ b/test/Actions/actions.py
@@ -131,3 +131,9 @@ scons: `.' is up to date.
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/addpost-link.py b/test/Actions/addpost-link.py
index 7721fde4..0a94c7d0 100644
--- a/test/Actions/addpost-link.py
+++ b/test/Actions/addpost-link.py
@@ -88,3 +88,9 @@ expect = 'strip.py: %s' % test.workpath('test1.exe')
 test.must_contain_all_lines(test.stdout(), [expect])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/append.py b/test/Actions/append.py
index 4b13107f..f617280e 100644
--- a/test/Actions/append.py
+++ b/test/Actions/append.py
@@ -81,3 +81,9 @@ test.fail_test(open('before.txt', 'rb').read() != "Bar\n")
 os.chmod(after_exe, os.stat(after_exe)[stat.ST_MODE] | stat.S_IXUSR)
 test.run(program=after_exe, stdout="Foo\n")
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/exitstatfunc.py b/test/Actions/exitstatfunc.py
index c52e1f50..c2feef80 100644
--- a/test/Actions/exitstatfunc.py
+++ b/test/Actions/exitstatfunc.py
@@ -65,3 +65,9 @@ test.run(arguments = 'test2')
 test.must_match('test2.out', "test2.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/function.py b/test/Actions/function.py
index 4fc0dc4a..6d18e5c3 100644
--- a/test/Actions/function.py
+++ b/test/Actions/function.py
@@ -236,3 +236,9 @@ runtest('trailer=MyTrailer', """Head:0:1:MyTrailer\n18\naaa\n""")
 runtest('', """Head:0:1:Tail\n18\naaa\n""")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/pre-post.py b/test/Actions/pre-post.py
index 647b6e98..9ea397f0 100644
--- a/test/Actions/pre-post.py
+++ b/test/Actions/pre-post.py
@@ -205,3 +205,9 @@ test.pass_test()
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/timestamp.py b/test/Actions/timestamp.py
index ee93596e..835ac7fa 100644
--- a/test/Actions/timestamp.py
+++ b/test/Actions/timestamp.py
@@ -54,3 +54,9 @@ env.Command('file.out', 'file.in', my_copy)
 test.not_up_to_date(arguments = 'file.out')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Actions/unicode-signature.py b/test/Actions/unicode-signature.py
index dd7f883a..0d0c4694 100644
--- a/test/Actions/unicode-signature.py
+++ b/test/Actions/unicode-signature.py
@@ -63,3 +63,9 @@ test.must_match('foo.txt', "funcact\n")
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AddMethod.py b/test/AddMethod.py
index 584ab4c1..af84cb34 100644
--- a/test/AddMethod.py
+++ b/test/AddMethod.py
@@ -65,3 +65,9 @@ foo-444
 test.run(arguments = '-Q -q', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AddOption/basic.py b/test/AddOption/basic.py
index b41b63a8..a1bb7b33 100644
--- a/test/AddOption/basic.py
+++ b/test/AddOption/basic.py
@@ -66,3 +66,9 @@ test.run('-Q -q . -- --prefix=/home/foo --force',
          stdout="None\nNone\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AddOption/help.py b/test/AddOption/help.py
index d7f02f19..7b5c01dd 100644
--- a/test/AddOption/help.py
+++ b/test/AddOption/help.py
@@ -80,3 +80,9 @@ if unexpected:
     test.fail_test()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AddOption/optional-arg.py b/test/AddOption/optional-arg.py
index 2bf849e3..f976ad96 100644
--- a/test/AddOption/optional-arg.py
+++ b/test/AddOption/optional-arg.py
@@ -98,3 +98,9 @@ test.run(status=2, stderr=expect, match=TestSCons.match_re)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Alias/Alias.py b/test/Alias/Alias.py
index 0af4dc26..73cffc4d 100644
--- a/test/Alias/Alias.py
+++ b/test/Alias/Alias.py
@@ -167,3 +167,9 @@ test.run(arguments = 'f1.out', match = TestCmd.match_exact, stdout = expect)
 test.up_to_date(arguments = 'f1.out')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Alias/Depends.py b/test/Alias/Depends.py
index b4ea95cf..bba0abd4 100644
--- a/test/Alias/Depends.py
+++ b/test/Alias/Depends.py
@@ -160,3 +160,9 @@ test.not_up_to_date(arguments = 'a2-file.out')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Alias/Dir-order.py b/test/Alias/Dir-order.py
index 8f1388d7..f0eaa0ce 100644
--- a/test/Alias/Dir-order.py
+++ b/test/Alias/Dir-order.py
@@ -41,3 +41,9 @@ f = Dir('foo')
 test.run(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Alias/action.py b/test/Alias/action.py
index 263df3cd..72aab6e0 100644
--- a/test/Alias/action.py
+++ b/test/Alias/action.py
@@ -133,3 +133,9 @@ test.must_match('foo', "foo(['build-add3'], ['f6.out'])\n")
 test.must_match('bar', "bar(['build-add3'], ['f6.out'])\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Alias/errors.py b/test/Alias/errors.py
index 964bae40..1334f4e9 100644
--- a/test/Alias/errors.py
+++ b/test/Alias/errors.py
@@ -41,3 +41,9 @@ test.run(arguments='A',
          status=2)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Alias/scanner.py b/test/Alias/scanner.py
index b6254e92..743191c4 100644
--- a/test/Alias/scanner.py
+++ b/test/Alias/scanner.py
@@ -56,3 +56,9 @@ test.run()
 test.fail_test(test.read('file.c') != "file.x\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Alias/srcdir.py b/test/Alias/srcdir.py
index 2d7a1547..4a0de437 100644
--- a/test/Alias/srcdir.py
+++ b/test/Alias/srcdir.py
@@ -98,3 +98,9 @@ test.run('minimal')
 test.must_match(['python', 'out-scons', 'foo.py'], "python/foo.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/AlwaysBuild.py b/test/AlwaysBuild.py
index 5b59ae4e..2fcc5c49 100644
--- a/test/AlwaysBuild.py
+++ b/test/AlwaysBuild.py
@@ -92,3 +92,9 @@ test.not_up_to_date(arguments = 'dir')
 test.must_match('dir_build.txt', "dir_build()\ndir_build()\ndir_build()\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/BadBuilder.py b/test/BadBuilder.py
index c7c9c95d..1e4e16c9 100644
--- a/test/BadBuilder.py
+++ b/test/BadBuilder.py
@@ -98,3 +98,9 @@ test.run(arguments='test2', stderr=expect_stderr, status = 2)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/Boolean.py b/test/Batch/Boolean.py
index e5f8d24a..53cceb69 100644
--- a/test/Batch/Boolean.py
+++ b/test/Batch/Boolean.py
@@ -71,3 +71,9 @@ test.must_match('f3a.out', "f3a.in\n")
 test.must_match('f3b.out', "f3b.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/CHANGED_SOURCES.py b/test/Batch/CHANGED_SOURCES.py
index 9059afdd..0b9f3ba5 100644
--- a/test/Batch/CHANGED_SOURCES.py
+++ b/test/Batch/CHANGED_SOURCES.py
@@ -116,3 +116,9 @@ test.must_match(['out3', 'f3a.out'], "f3a.in 2\n")
 test.must_match(['out3', 'f3b.out'], "f3b.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/SOURCES.py b/test/Batch/SOURCES.py
index 86b3b929..ddb3b10d 100644
--- a/test/Batch/SOURCES.py
+++ b/test/Batch/SOURCES.py
@@ -118,3 +118,9 @@ test.must_match(['out3', 'f3a.out'], "f3a.in 2\n")
 test.must_match(['out3', 'f3b.out'], "f3b.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/action-changed.py b/test/Batch/action-changed.py
index 935bce89..886a6921 100644
--- a/test/Batch/action-changed.py
+++ b/test/Batch/action-changed.py
@@ -90,3 +90,9 @@ test.must_match('f2.out', "two\nf2.in\n")
 test.must_match('f3.out', "two\nf3.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/callable.py b/test/Batch/callable.py
index fc96f15d..6fbd11cf 100644
--- a/test/Batch/callable.py
+++ b/test/Batch/callable.py
@@ -101,3 +101,9 @@ test.must_match(['sub1', 'f2a.out'], "f2a.in\n")
 test.must_match(['sub2', 'f2b.out'], "f2b.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/generated.py b/test/Batch/generated.py
index 4f31a7ee..21b8250f 100644
--- a/test/Batch/generated.py
+++ b/test/Batch/generated.py
@@ -74,3 +74,9 @@ test.must_match('f2.out', "f2.in\n")
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/removed.py b/test/Batch/removed.py
index 19dc6c81..f4455c2f 100644
--- a/test/Batch/removed.py
+++ b/test/Batch/removed.py
@@ -103,3 +103,9 @@ test.must_match(['out3', 'f3a.out'], "f3a.in\n")
 test.must_match(['out3', 'f3b.out'], "f3b.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Batch/up_to_date.py b/test/Batch/up_to_date.py
index 9563c403..58152e0f 100644
--- a/test/Batch/up_to_date.py
+++ b/test/Batch/up_to_date.py
@@ -85,3 +85,9 @@ test.must_match(['out3', 'f3b.out'], "f3b.in\n")
 test.up_to_date(options = '--debug=explain', arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/BitKeeper/BITKEEPERCOM.py b/test/BitKeeper/BITKEEPERCOM.py
index a4bdd90e..aed066ce 100644
--- a/test/BitKeeper/BITKEEPERCOM.py
+++ b/test/BitKeeper/BITKEEPERCOM.py
@@ -119,3 +119,9 @@ test.must_match(['sub', 'all'],
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/BitKeeper/BITKEEPERCOMSTR.py b/test/BitKeeper/BITKEEPERCOMSTR.py
index aa9e2a0a..a8207c64 100644
--- a/test/BitKeeper/BITKEEPERCOMSTR.py
+++ b/test/BitKeeper/BITKEEPERCOMSTR.py
@@ -120,3 +120,9 @@ test.must_match(['sub', 'all'],
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/BitKeeper/BitKeeper.py b/test/BitKeeper/BitKeeper.py
index 2fa3921e..9a61e75c 100644
--- a/test/BitKeeper/BitKeeper.py
+++ b/test/BitKeeper/BitKeeper.py
@@ -344,3 +344,9 @@ test.must_not_be_writable(test.workpath('work3', 'sub', 'ddd.in'))
 test.must_not_be_writable(test.workpath('work3', 'sub', 'fff.in'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder-factories.py b/test/Builder-factories.py
index 41f83a2c..fec90771 100644
--- a/test/Builder-factories.py
+++ b/test/Builder-factories.py
@@ -72,3 +72,9 @@ test.must_match(["foo", "marker"], "MakeDirectory\n")
 test.must_match("output", "src/file1\nsrc/file2\nsrc/file3\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/TargetSubst.py b/test/Builder/TargetSubst.py
index 396d371c..7d0438cc 100644
--- a/test/Builder/TargetSubst.py
+++ b/test/Builder/TargetSubst.py
@@ -44,3 +44,9 @@ test.write('infile', "infile\n")
 test.run(arguments = '.')
 test.must_match('infile.out', "infile\n")
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/add_src_builder.py b/test/Builder/add_src_builder.py
index f67acc06..d5b13c1a 100644
--- a/test/Builder/add_src_builder.py
+++ b/test/Builder/add_src_builder.py
@@ -63,3 +63,9 @@ test.must_match('file1.mid', "file1.in\n")
 test.must_match('file1.out', "file1.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/ensure_suffix.py b/test/Builder/ensure_suffix.py
index ee236354..4515ff66 100644
--- a/test/Builder/ensure_suffix.py
+++ b/test/Builder/ensure_suffix.py
@@ -53,3 +53,9 @@ test.run(arguments = '.')
 test.must_match('aa.bb.cc.dd.dll', "clean test\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/different-actions.py b/test/Builder/multi/different-actions.py
index ed1c6766..66b1e8ec 100644
--- a/test/Builder/multi/different-actions.py
+++ b/test/Builder/multi/different-actions.py
@@ -58,3 +58,9 @@ test.pass_test()
 test.run(arguments='file6.out', status=2, stderr=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/different-environments.py b/test/Builder/multi/different-environments.py
index 9d1dcc89..ad5154ad 100644
--- a/test/Builder/multi/different-environments.py
+++ b/test/Builder/multi/different-environments.py
@@ -62,3 +62,9 @@ scons: *** Two environments with different actions were specified for the same t
 test.run(arguments='file03.out', status=2, stderr=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/different-multi.py b/test/Builder/multi/different-multi.py
index 1f0ef2a1..dce235e2 100644
--- a/test/Builder/multi/different-multi.py
+++ b/test/Builder/multi/different-multi.py
@@ -62,3 +62,9 @@ scons: *** Two different builders (B and C) were specified for the same target:
 test.run(arguments='file8.out', status=2, stderr=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/different-order.py b/test/Builder/multi/different-order.py
index f4a64435..99a19c2f 100644
--- a/test/Builder/multi/different-order.py
+++ b/test/Builder/multi/different-order.py
@@ -57,3 +57,9 @@ scons: *** Two different target lists have a target in common: file10b.out  (fro
 test.run(arguments='file10.out', status=2, stderr=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/different-overrides.py b/test/Builder/multi/different-overrides.py
index 5420a49c..8eb3e13d 100644
--- a/test/Builder/multi/different-overrides.py
+++ b/test/Builder/multi/different-overrides.py
@@ -56,3 +56,9 @@ scons: warning: Two different environments were specified for target file3.out,
 test.run(arguments='file3.out', stderr=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/different-target-lists.py b/test/Builder/multi/different-target-lists.py
index 58221993..39e388ca 100644
--- a/test/Builder/multi/different-target-lists.py
+++ b/test/Builder/multi/different-target-lists.py
@@ -62,3 +62,9 @@ scons: *** Two different target lists have a target in common: file11b.out  (fro
 test.run(arguments='file11.out', status=2, stderr=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/error.py b/test/Builder/multi/error.py
index 4201cfc5..37a012b7 100644
--- a/test/Builder/multi/error.py
+++ b/test/Builder/multi/error.py
@@ -55,3 +55,9 @@ scons: *** Multiple ways to build the same target were specified for: file2.out
 test.run(arguments='file2.out', status=2, stderr=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/lone-target-list.py b/test/Builder/multi/lone-target-list.py
index a305b544..40e7dc9d 100644
--- a/test/Builder/multi/lone-target-list.py
+++ b/test/Builder/multi/lone-target-list.py
@@ -57,3 +57,9 @@ test.run(arguments='file12.out', status=2, stderr=expect)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/multi.py b/test/Builder/multi/multi.py
index 315599b3..b2ceae9b 100644
--- a/test/Builder/multi/multi.py
+++ b/test/Builder/multi/multi.py
@@ -53,3 +53,9 @@ test.run(arguments='file1.out')
 test.must_match('file1.out', "file1a.in\nfile1b.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/same-actions.py b/test/Builder/multi/same-actions.py
index afccb652..5695fa38 100644
--- a/test/Builder/multi/same-actions.py
+++ b/test/Builder/multi/same-actions.py
@@ -59,3 +59,9 @@ test.run(arguments='file5.out', stderr=expect)
 test.must_match('file5.out', "file5a.in\nfile5b.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/same-overrides.py b/test/Builder/multi/same-overrides.py
index d12af218..5a3a7f8c 100644
--- a/test/Builder/multi/same-overrides.py
+++ b/test/Builder/multi/same-overrides.py
@@ -69,3 +69,9 @@ test.run(arguments='file4.out', stderr=expect)
 test.must_match('file4.out', "3\nfile4a.in\nfile4b.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/multi/same-targets.py b/test/Builder/multi/same-targets.py
index 19efff76..714b9dab 100644
--- a/test/Builder/multi/same-targets.py
+++ b/test/Builder/multi/same-targets.py
@@ -55,3 +55,9 @@ test.must_match('file9a.out', "file9a.in\nfile9b.in\n")
 test.must_match('file9b.out', "file9a.in\nfile9b.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/non-multi.py b/test/Builder/non-multi.py
index 1d5822ef..70e800c9 100644
--- a/test/Builder/non-multi.py
+++ b/test/Builder/non-multi.py
@@ -52,3 +52,9 @@ test.run(arguments='file7.out')
 test.must_match('file7.out', "file7.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Builder/srcdir.py b/test/Builder/srcdir.py
index 4f378a71..63732d7a 100644
--- a/test/Builder/srcdir.py
+++ b/test/Builder/srcdir.py
@@ -74,3 +74,9 @@ file4
 test.must_match(['src', 'output'],  expected)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/CC.py b/test/CC/CC.py
index c57b7db9..c4120948 100644
--- a/test/CC/CC.py
+++ b/test/CC/CC.py
@@ -203,3 +203,9 @@ test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
 test.up_to_date(arguments = 'bar' + _exe)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/CCCOM.py b/test/CC/CCCOM.py
index 9cc5430c..474a930d 100644
--- a/test/CC/CCCOM.py
+++ b/test/CC/CCCOM.py
@@ -78,3 +78,9 @@ test.must_match('test2.obj', "test2.C\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/CCCOMSTR.py b/test/CC/CCCOMSTR.py
index bd54a153..f24f6c74 100644
--- a/test/CC/CCCOMSTR.py
+++ b/test/CC/CCCOMSTR.py
@@ -83,3 +83,9 @@ test.must_match('test2.obj', "test2.C\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/CCFLAGS.py b/test/CC/CCFLAGS.py
index bee24992..e273bfd7 100644
--- a/test/CC/CCFLAGS.py
+++ b/test/CC/CCFLAGS.py
@@ -95,3 +95,9 @@ test.run(program = test.workpath('foo'), stdout = "prog.c:  BAR\n")
 test.run(program = test.workpath('bar'), stdout = "prog.c:  BAR\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/CFLAGS.py b/test/CC/CFLAGS.py
index 6ccf7e28..d5efa1a3 100644
--- a/test/CC/CFLAGS.py
+++ b/test/CC/CFLAGS.py
@@ -111,3 +111,9 @@ test.run(program = test.workpath('foo'), stdout = "prog.c:  BAR\n")
 test.run(program = test.workpath('bar'), stdout = "prog.c:  BAR\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/SHCC.py b/test/CC/SHCC.py
index 9a025b15..db03d20a 100644
--- a/test/CC/SHCC.py
+++ b/test/CC/SHCC.py
@@ -85,3 +85,9 @@ test.run(arguments = 'bar')
 test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/SHCCCOM.py b/test/CC/SHCCCOM.py
index 695ad591..44184b45 100644
--- a/test/CC/SHCCCOM.py
+++ b/test/CC/SHCCCOM.py
@@ -77,3 +77,9 @@ test.must_match('test2.obj', "test2.C\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/SHCCCOMSTR.py b/test/CC/SHCCCOMSTR.py
index 31a46c47..c8daaf6c 100644
--- a/test/CC/SHCCCOMSTR.py
+++ b/test/CC/SHCCCOMSTR.py
@@ -84,3 +84,9 @@ test.must_match('test2.obj', "test2.C\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/SHCCFLAGS.py b/test/CC/SHCCFLAGS.py
index fc9264f7..d77d2474 100644
--- a/test/CC/SHCCFLAGS.py
+++ b/test/CC/SHCCFLAGS.py
@@ -129,3 +129,9 @@ test.run(program = test.workpath('fooprog'), stdout = "prog.c:  BAR\n")
 test.run(program = test.workpath('barprog'), stdout = "prog.c:  BAR\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CC/SHCFLAGS.py b/test/CC/SHCFLAGS.py
index ef20120b..c201c97c 100644
--- a/test/CC/SHCFLAGS.py
+++ b/test/CC/SHCFLAGS.py
@@ -129,3 +129,9 @@ test.run(program = test.workpath('fooprog'), stdout = "prog.c:  BAR\n")
 test.run(program = test.workpath('barprog'), stdout = "prog.c:  BAR\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CFILESUFFIX.py b/test/CFILESUFFIX.py
index a8c44a6b..1cce9e95 100644
--- a/test/CFILESUFFIX.py
+++ b/test/CFILESUFFIX.py
@@ -87,3 +87,9 @@ test.must_exist(test.workpath('bar.xyz'))
 test.must_exist(test.workpath('f3.env2'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPDEFINES/basic.py b/test/CPPDEFINES/basic.py
index 5c302c33..4259a243 100644
--- a/test/CPPDEFINES/basic.py
+++ b/test/CPPDEFINES/basic.py
@@ -62,3 +62,9 @@ expect = test.wrap_stdout(build_str="scons: `.' is up to date.\n",
 test.run(arguments = '.', stdout=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPDEFINES/live.py b/test/CPPDEFINES/live.py
index 7a169e8b..0c7ad787 100644
--- a/test/CPPDEFINES/live.py
+++ b/test/CPPDEFINES/live.py
@@ -82,3 +82,9 @@ test.run(program = test.workpath('bar'), stdout = "prog.c:  BAR 8\n")
 test.run(program = test.workpath('baz'), stdout = "baz.cpp:  BAZ 9\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPDEFINES/scan.py b/test/CPPDEFINES/scan.py
index c9b60c3f..53186425 100644
--- a/test/CPPDEFINES/scan.py
+++ b/test/CPPDEFINES/scan.py
@@ -179,3 +179,9 @@ test.run(program = test.workpath('f4'), stdout = "prog.c:  F4 again\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPDEFINES/undefined.py b/test/CPPDEFINES/undefined.py
index b6b8b445..47825b6a 100644
--- a/test/CPPDEFINES/undefined.py
+++ b/test/CPPDEFINES/undefined.py
@@ -43,3 +43,9 @@ expect = test.wrap_stdout(build_str="scons: `.' is up to date.\n",
 test.run(arguments = '.', stdout=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPFLAGS.py b/test/CPPFLAGS.py
index a8212963..4c594e5c 100644
--- a/test/CPPFLAGS.py
+++ b/test/CPPFLAGS.py
@@ -181,3 +181,9 @@ else:
     test.must_match('mygcc.out', "cc\nc++\n")   
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/CPPPATH.py b/test/CPPPATH/CPPPATH.py
index 1146ee09..efa64d2b 100644
--- a/test/CPPPATH/CPPPATH.py
+++ b/test/CPPPATH/CPPPATH.py
@@ -302,3 +302,9 @@ test.up_to_date(arguments = args)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/Dir.py b/test/CPPPATH/Dir.py
index 1059467c..8b557dcf 100644
--- a/test/CPPPATH/Dir.py
+++ b/test/CPPPATH/Dir.py
@@ -77,3 +77,9 @@ test.run(arguments = '.')
 test.run(program = test.workpath('prog' + _exe), stdout = "1\n2\n3\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/absolute-path.py b/test/CPPPATH/absolute-path.py
index 9adb206d..5c60de19 100644
--- a/test/CPPPATH/absolute-path.py
+++ b/test/CPPPATH/absolute-path.py
@@ -73,3 +73,9 @@ test.write(['include', 'inc.h'], """\
 test.not_up_to_date(chdir = 'work', arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/expand-object.py b/test/CPPPATH/expand-object.py
index 5e1b06fd..54e1d397 100644
--- a/test/CPPPATH/expand-object.py
+++ b/test/CPPPATH/expand-object.py
@@ -61,3 +61,9 @@ test.run(arguments = '.')
 test.must_exist(test.workpath('foo' + TestSCons._obj))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/function-expansion.py b/test/CPPPATH/function-expansion.py
index 7c80f22c..8ddd23c1 100644
--- a/test/CPPPATH/function-expansion.py
+++ b/test/CPPPATH/function-expansion.py
@@ -135,3 +135,9 @@ inc3/subdir/string_3.h 2
 test.run(program = test.workpath('prog' + TestSCons._exe), stdout=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/list-expansion.py b/test/CPPPATH/list-expansion.py
index 7e5326f1..98817b9a 100644
--- a/test/CPPPATH/list-expansion.py
+++ b/test/CPPPATH/list-expansion.py
@@ -130,3 +130,9 @@ sub4/string4.h
 test.run(program = test.workpath('test' + TestSCons._exe), stdout=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/match-dir.py b/test/CPPPATH/match-dir.py
index 6305d0c9..e1d26046 100644
--- a/test/CPPPATH/match-dir.py
+++ b/test/CPPPATH/match-dir.py
@@ -59,3 +59,9 @@ test.run(arguments = '.')
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/nested-lists.py b/test/CPPPATH/nested-lists.py
index 8ec97bc4..aa48b920 100644
--- a/test/CPPPATH/nested-lists.py
+++ b/test/CPPPATH/nested-lists.py
@@ -75,3 +75,9 @@ test.run(arguments = '.')
 test.run(program = test.workpath('prog' + _exe), stdout = "1\n2\n3\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/null.py b/test/CPPPATH/null.py
index 19895dbb..e23f6558 100644
--- a/test/CPPPATH/null.py
+++ b/test/CPPPATH/null.py
@@ -53,3 +53,9 @@ test.run(arguments = '.',
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPPATH/subdir-as-include.py b/test/CPPPATH/subdir-as-include.py
index 5ec0b165..1ff70a5f 100644
--- a/test/CPPPATH/subdir-as-include.py
+++ b/test/CPPPATH/subdir-as-include.py
@@ -90,3 +90,9 @@ test.run(program = test.workpath('prog' + _exe), stdout = "1\n")
 test.run(program = test.workpath('inc1/build/one' + _exe), stdout = "1\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CPPSUFFIXES.py b/test/CPPSUFFIXES.py
index 6133bdf4..b2e63697 100644
--- a/test/CPPSUFFIXES.py
+++ b/test/CPPSUFFIXES.py
@@ -161,3 +161,9 @@ foo.h 2
 test.up_to_date(arguments='.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CVS.py b/test/CVS.py
index 510539cc..b702d987 100644
--- a/test/CVS.py
+++ b/test/CVS.py
@@ -298,3 +298,9 @@ test.must_match(['work3', 'all'],
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CVSCOM.py b/test/CVSCOM.py
index cbb2f3ff..79acb5ae 100644
--- a/test/CVSCOM.py
+++ b/test/CVSCOM.py
@@ -119,3 +119,9 @@ test.must_match(['sub', 'all'],
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CVSCOMSTR.py b/test/CVSCOMSTR.py
index acf0647a..ae428418 100644
--- a/test/CVSCOMSTR.py
+++ b/test/CVSCOMSTR.py
@@ -120,3 +120,9 @@ test.must_match(['sub', 'all'],
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CC-variables.py b/test/CXX/CC-variables.py
index fea3dde0..a2a2fbeb 100644
--- a/test/CXX/CC-variables.py
+++ b/test/CXX/CC-variables.py
@@ -48,3 +48,9 @@ g++ -o test.obj -c +for_CCFLAGS -Wp,-for_CPPFLAGS test.cxx
 test.run(arguments = '-Q -n test.obj', stdout=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CCFLAGS.py b/test/CXX/CCFLAGS.py
index deaa2b64..061df87a 100644
--- a/test/CXX/CCFLAGS.py
+++ b/test/CXX/CCFLAGS.py
@@ -68,3 +68,9 @@ test.run(program = test.workpath('foo'), stdout = "prog.c:  FOO\n")
 test.run(program = test.workpath('bar'), stdout = "prog.c:  BAR\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CXX.py b/test/CXX/CXX.py
index f537ee87..e6bc82bf 100644
--- a/test/CXX/CXX.py
+++ b/test/CXX/CXX.py
@@ -227,3 +227,9 @@ test.run(arguments = 'bar' + _exe)
 test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CXXCOM.py b/test/CXX/CXXCOM.py
index 64e4a50f..be1bec49 100644
--- a/test/CXX/CXXCOM.py
+++ b/test/CXX/CXXCOM.py
@@ -79,3 +79,9 @@ test.must_match('test6.obj', "test6.C\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CXXCOMSTR.py b/test/CXX/CXXCOMSTR.py
index e738533e..ebacd194 100644
--- a/test/CXX/CXXCOMSTR.py
+++ b/test/CXX/CXXCOMSTR.py
@@ -87,3 +87,9 @@ test.must_match('test6.obj', "test6.C\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CXXFILESUFFIX.py b/test/CXX/CXXFILESUFFIX.py
index f74ec848..7d5609b4 100644
--- a/test/CXX/CXXFILESUFFIX.py
+++ b/test/CXX/CXXFILESUFFIX.py
@@ -83,3 +83,9 @@ test.must_exist(test.workpath('bar.xyz'))
 test.must_exist(test.workpath('f3.env2'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/CXXFLAGS.py b/test/CXX/CXXFLAGS.py
index f37cdbbf..f83fe480 100644
--- a/test/CXX/CXXFLAGS.py
+++ b/test/CXX/CXXFLAGS.py
@@ -163,3 +163,9 @@ test.run(program = test.workpath('barprog'), stdout = "doIt.cpp:  BAR\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/SHCXX.py b/test/CXX/SHCXX.py
index abfc19df..6c03b8f8 100644
--- a/test/CXX/SHCXX.py
+++ b/test/CXX/SHCXX.py
@@ -83,3 +83,9 @@ test.run(arguments = 'bar')
 test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/SHCXXCOM.py b/test/CXX/SHCXXCOM.py
index 1a8750fe..972dad0a 100644
--- a/test/CXX/SHCXXCOM.py
+++ b/test/CXX/SHCXXCOM.py
@@ -78,3 +78,9 @@ test.must_match('test6.obj', "test6.C\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/SHCXXCOMSTR.py b/test/CXX/SHCXXCOMSTR.py
index 829c9e4a..b9f20a8b 100644
--- a/test/CXX/SHCXXCOMSTR.py
+++ b/test/CXX/SHCXXCOMSTR.py
@@ -88,3 +88,9 @@ test.must_match('test6.obj', "test6.C\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CXX/SHCXXFLAGS.py b/test/CXX/SHCXXFLAGS.py
index 0ce2b15b..a4d552e0 100644
--- a/test/CXX/SHCXXFLAGS.py
+++ b/test/CXX/SHCXXFLAGS.py
@@ -133,3 +133,9 @@ test.run(program = test.workpath('fooprog'), stdout = "prog.cpp:  BAR\n")
 test.run(program = test.workpath('barprog'), stdout = "prog.cpp:  BAR\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/CacheDir.py b/test/CacheDir/CacheDir.py
index f918707f..c72b2d06 100644
--- a/test/CacheDir/CacheDir.py
+++ b/test/CacheDir/CacheDir.py
@@ -155,3 +155,9 @@ test.up_to_date(chdir = 'src', arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/NoCache.py b/test/CacheDir/NoCache.py
index 44e51a01..7e9b5406 100644
--- a/test/CacheDir/NoCache.py
+++ b/test/CacheDir/NoCache.py
@@ -73,3 +73,9 @@ test.must_match(['beta','bar_cached'],      'alpha')
 test.must_match(['beta','bar_notcached'],   'beta')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/SideEffect.py b/test/CacheDir/SideEffect.py
index 814a5e37..e84ab090 100644
--- a/test/CacheDir/SideEffect.py
+++ b/test/CacheDir/SideEffect.py
@@ -105,3 +105,9 @@ test.must_match(['work', 'log.txt'], expect)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/VariantDir.py b/test/CacheDir/VariantDir.py
index b5650c14..8ba3e781 100644
--- a/test/CacheDir/VariantDir.py
+++ b/test/CacheDir/VariantDir.py
@@ -146,3 +146,9 @@ test.up_to_date(arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/debug.py b/test/CacheDir/debug.py
index 93012411..94880be3 100644
--- a/test/CacheDir/debug.py
+++ b/test/CacheDir/debug.py
@@ -173,3 +173,9 @@ test.must_match(debug_out, expect, mode='r')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/environment.py b/test/CacheDir/environment.py
index 391fb94f..297d46d8 100644
--- a/test/CacheDir/environment.py
+++ b/test/CacheDir/environment.py
@@ -161,3 +161,9 @@ test.up_to_date(chdir = 'src', arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/multi-targets.py b/test/CacheDir/multi-targets.py
index 0de03313..9ca194ee 100644
--- a/test/CacheDir/multi-targets.py
+++ b/test/CacheDir/multi-targets.py
@@ -68,3 +68,9 @@ test.must_exist(multiple_bar)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/multiple-targets.py b/test/CacheDir/multiple-targets.py
index 77b8f6fb..d7e6ac7a 100644
--- a/test/CacheDir/multiple-targets.py
+++ b/test/CacheDir/multiple-targets.py
@@ -64,3 +64,9 @@ test.must_exist(test.workpath('foo'))
 test.must_exist(test.workpath('bar'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/option--cd.py b/test/CacheDir/option--cd.py
index 9aa94023..9b9f2f7a 100644
--- a/test/CacheDir/option--cd.py
+++ b/test/CacheDir/option--cd.py
@@ -127,3 +127,9 @@ test.unlink(['src', 'cat.out'])
 
 # All done.
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/option--cf.py b/test/CacheDir/option--cf.py
index 47847d43..b2237556 100644
--- a/test/CacheDir/option--cf.py
+++ b/test/CacheDir/option--cf.py
@@ -121,3 +121,9 @@ test.fail_test(os.path.exists(test.workpath('src', 'cat.out')))
 
 # All done.
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/option--cs.py b/test/CacheDir/option--cs.py
index 1e62c491..df1a87f7 100644
--- a/test/CacheDir/option--cs.py
+++ b/test/CacheDir/option--cs.py
@@ -192,3 +192,9 @@ test.up_to_date(chdir = 'src2', arguments = '.')
 
 # All done.
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/scanner-target.py b/test/CacheDir/scanner-target.py
index 33930d8e..645b5977 100644
--- a/test/CacheDir/scanner-target.py
+++ b/test/CacheDir/scanner-target.py
@@ -78,3 +78,9 @@ test.run()
 test.must_not_exist(test.workpath('cache', 'N', 'None'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/source-scanner.py b/test/CacheDir/source-scanner.py
index 119a959d..e7db5e91 100644
--- a/test/CacheDir/source-scanner.py
+++ b/test/CacheDir/source-scanner.py
@@ -82,3 +82,9 @@ test.must_not_exist(test.workpath(cache, 'N', 'None'))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/symlink.py b/test/CacheDir/symlink.py
index 3bc8ec11..ca3bbe24 100644
--- a/test/CacheDir/symlink.py
+++ b/test/CacheDir/symlink.py
@@ -65,3 +65,9 @@ test.fail_test(not os.path.islink('file.symlink'))
 test.must_match('file.symlink', "file.txt\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/timestamp-match.py b/test/CacheDir/timestamp-match.py
index 0e0074db..afc3f63c 100644
--- a/test/CacheDir/timestamp-match.py
+++ b/test/CacheDir/timestamp-match.py
@@ -57,3 +57,9 @@ test.up_to_date(options = '--cache-show --debug=explain', arguments = '.')
 test.up_to_date(options = '--cache-show --debug=explain', arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/timestamp-newer.py b/test/CacheDir/timestamp-newer.py
index 36267f8d..8a47fec2 100644
--- a/test/CacheDir/timestamp-newer.py
+++ b/test/CacheDir/timestamp-newer.py
@@ -57,3 +57,9 @@ test.up_to_date(options = '--cache-show --debug=explain', arguments = '.')
 test.up_to_date(options = '--cache-show --debug=explain', arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CacheDir/up-to-date-q.py b/test/CacheDir/up-to-date-q.py
index 3830cd2e..275b1276 100644
--- a/test/CacheDir/up-to-date-q.py
+++ b/test/CacheDir/up-to-date-q.py
@@ -79,3 +79,9 @@ test.run(chdir = 'beta', arguments = '.')
 test.run(chdir = 'beta', arguments = '. -q')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Case.py b/test/Case.py
index 4f089275..435ca4ac 100644
--- a/test/Case.py
+++ b/test/Case.py
@@ -84,3 +84,9 @@ else:
     test.run(program = test.workpath('main' + _exe), stdout = "foo\nbar\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Chmod.py b/test/Chmod.py
index b603f35d..cf31d006 100644
--- a/test/Chmod.py
+++ b/test/Chmod.py
@@ -188,3 +188,9 @@ s = stat.S_IMODE(os.stat(test.workpath('d12'))[stat.ST_MODE])
 test.fail_test(s != 0777)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/U-Default-dir.py b/test/Climb/U-Default-dir.py
index f9f3b5d3..323ceb14 100644
--- a/test/Climb/U-Default-dir.py
+++ b/test/Climb/U-Default-dir.py
@@ -40,3 +40,9 @@ Default('.')
 test.run(arguments = '-U')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/U-Default-no-target.py b/test/Climb/U-Default-no-target.py
index 6ae5f769..b53c2951 100644
--- a/test/Climb/U-Default-no-target.py
+++ b/test/Climb/U-Default-no-target.py
@@ -42,3 +42,9 @@ scons: *** Do not know how to make target `not_a_target.in'.  Stop.
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/U-no-Default.py b/test/Climb/U-no-Default.py
index 987f06f9..24ed4bc8 100644
--- a/test/Climb/U-no-Default.py
+++ b/test/Climb/U-no-Default.py
@@ -40,3 +40,9 @@ test.run(arguments = '-U',
          status = 2)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/explicit-parent--D.py b/test/Climb/explicit-parent--D.py
index c76e63b1..da58b382 100644
--- a/test/Climb/explicit-parent--D.py
+++ b/test/Climb/explicit-parent--D.py
@@ -72,3 +72,9 @@ test.must_not_exist(test.workpath('dir', 'f4.out'))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/explicit-parent--U.py b/test/Climb/explicit-parent--U.py
index b3c61c0e..18cb5891 100644
--- a/test/Climb/explicit-parent--U.py
+++ b/test/Climb/explicit-parent--U.py
@@ -64,3 +64,9 @@ test.must_exist(test.workpath('foo.out'))
 test.must_not_exist(test.workpath('subdir', 'bar.out'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/explicit-parent-u.py b/test/Climb/explicit-parent-u.py
index eb4bd0db..633a4d31 100644
--- a/test/Climb/explicit-parent-u.py
+++ b/test/Climb/explicit-parent-u.py
@@ -70,3 +70,9 @@ test.must_not_exist(test.workpath('dir', 'f3.out'))
 test.must_not_exist(test.workpath('dir', 'f4.out'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/filename--D.py b/test/Climb/filename--D.py
index 1b3c3006..06d95e78 100644
--- a/test/Climb/filename--D.py
+++ b/test/Climb/filename--D.py
@@ -71,3 +71,9 @@ test.run(chdir='other',
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/filename--U.py b/test/Climb/filename--U.py
index 10c1c8a9..7f2e60dc 100644
--- a/test/Climb/filename--U.py
+++ b/test/Climb/filename--U.py
@@ -69,3 +69,9 @@ test.run(chdir='other',
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/filename-u.py b/test/Climb/filename-u.py
index ec67e652..7bae153f 100644
--- a/test/Climb/filename-u.py
+++ b/test/Climb/filename-u.py
@@ -69,3 +69,9 @@ test.run(chdir='other',
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/option--D.py b/test/Climb/option--D.py
index 7f3dc39e..57c08534 100644
--- a/test/Climb/option--D.py
+++ b/test/Climb/option--D.py
@@ -83,3 +83,9 @@ test.must_exist(test.workpath('sub2', 'bar.out'))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/option--U.py b/test/Climb/option--U.py
index 93cebd33..04ab26a1 100644
--- a/test/Climb/option--U.py
+++ b/test/Climb/option--U.py
@@ -138,3 +138,9 @@ test.must_not_exist(test.workpath('bar.out'))
 test.must_not_exist(test.workpath('sub2/xxx.out'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Climb/option-u.py b/test/Climb/option-u.py
index bbacbc9e..6fc27207 100644
--- a/test/Climb/option-u.py
+++ b/test/Climb/option-u.py
@@ -141,3 +141,9 @@ test.must_match(['build', 'dir', 'f4b.out'], "sub4/dir/f4b.in")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Clone-compatibility.py b/test/Clone-compatibility.py
index 53719e93..089b7a47 100644
--- a/test/Clone-compatibility.py
+++ b/test/Clone-compatibility.py
@@ -55,3 +55,9 @@ print env2['X']
 test.run(arguments = '-q -Q', stdout = "1\n2\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Command.py b/test/Command.py
index 09c51abc..ada2ae49 100644
--- a/test/Command.py
+++ b/test/Command.py
@@ -118,3 +118,9 @@ test.must_match('f9.out', "f9.in\n")
 test.must_match('f10.out', "f10.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/CommandGenerator.py b/test/CommandGenerator.py
index 947ad421..9348bddb 100644
--- a/test/CommandGenerator.py
+++ b/test/CommandGenerator.py
@@ -69,3 +69,9 @@ test.fail_test(test.read(test.workpath('foo2.out')) != "foo2.in\n")
 test.fail_test(test.read(test.workpath('foo3.out')) != "foo3.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/Action-error.py b/test/Configure/Action-error.py
index 22ea7c77..90ba1ee2 100644
--- a/test/Configure/Action-error.py
+++ b/test/Configure/Action-error.py
@@ -46,3 +46,9 @@ expect = "scons: *** [target] Calling Configure from Builders is not supported.\
 test.run(status=2, stderr=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/Builder-call.py b/test/Configure/Builder-call.py
index 1ce114c6..037a2c77 100644
--- a/test/Configure/Builder-call.py
+++ b/test/Configure/Builder-call.py
@@ -55,3 +55,9 @@ env = conf.Finish()
 test.run(stderr="Hello World on stderr\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/CONFIGUREDIR.py b/test/Configure/CONFIGUREDIR.py
index ae1ea2ba..4b5a02e0 100644
--- a/test/Configure/CONFIGUREDIR.py
+++ b/test/Configure/CONFIGUREDIR.py
@@ -49,3 +49,9 @@ test.run()
 test.must_exist('custom_config_dir')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/CONFIGURELOG.py b/test/Configure/CONFIGURELOG.py
index 4b634404..9b6221be 100644
--- a/test/Configure/CONFIGURELOG.py
+++ b/test/Configure/CONFIGURELOG.py
@@ -60,3 +60,9 @@ scons: Configure: (cached) yes
 test.must_match('custom.logfile', expect, mode='r')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/ConfigureDryRunError.py b/test/Configure/ConfigureDryRunError.py
index 22436258..b4be67e2 100644
--- a/test/Configure/ConfigureDryRunError.py
+++ b/test/Configure/ConfigureDryRunError.py
@@ -101,3 +101,9 @@ if newLog != oldLog:
     test.fail_test()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/SConscript.py b/test/Configure/SConscript.py
index 2bfe2f74..73afef76 100644
--- a/test/Configure/SConscript.py
+++ b/test/Configure/SConscript.py
@@ -72,3 +72,9 @@ conf.Finish()
 test.run()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/VariantDir-SConscript.py b/test/Configure/VariantDir-SConscript.py
index 1fffacf7..c82778ae 100644
--- a/test/Configure/VariantDir-SConscript.py
+++ b/test/Configure/VariantDir-SConscript.py
@@ -157,3 +157,9 @@ test.checkLogAndStdout( ["Checking for C header file math.h... ",
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/VariantDir.py b/test/Configure/VariantDir.py
index be2d77d5..01df2767 100644
--- a/test/Configure/VariantDir.py
+++ b/test/Configure/VariantDir.py
@@ -89,3 +89,9 @@ test.checkLogAndStdout(["Checking for C header file math.h... ",
                       "SConstruct")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/basic.py b/test/Configure/basic.py
index d4b9a591..4344941f 100644
--- a/test/Configure/basic.py
+++ b/test/Configure/basic.py
@@ -83,3 +83,9 @@ test.checkLogAndStdout(["Checking for C header file math.h... ",
                       "config.log", ".sconf_temp", "SConstruct")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/build-fail.py b/test/Configure/build-fail.py
index 4e63f83a..74609f68 100644
--- a/test/Configure/build-fail.py
+++ b/test/Configure/build-fail.py
@@ -89,3 +89,9 @@ test.run(arguments='--config=force', stdout=expect)
 test.run()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/cache-not-ok.py b/test/Configure/cache-not-ok.py
index 7dc8773b..ccbb7d54 100644
--- a/test/Configure/cache-not-ok.py
+++ b/test/Configure/cache-not-ok.py
@@ -94,3 +94,9 @@ test.checkLogAndStdout(["Checking for C header file no_std_c_header.h... ",
                       "config.log", ".sconf_temp", "SConstruct")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/cache-ok.py b/test/Configure/cache-ok.py
index 7c98d0cc..93d1308f 100644
--- a/test/Configure/cache-ok.py
+++ b/test/Configure/cache-ok.py
@@ -118,3 +118,9 @@ test.checkLogAndStdout(["Checking for C library %s... " % lib,
                       "config.log", ".sconf_temp", "SConstruct")    
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/clean.py b/test/Configure/clean.py
index a48029db..bb15165c 100644
--- a/test/Configure/clean.py
+++ b/test/Configure/clean.py
@@ -76,3 +76,9 @@ test.run(arguments = '--clean clean=1')
 test.must_contain_all_lines(test.stdout(), lines)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/config-h.py b/test/Configure/config-h.py
index 95121a9b..9276ec83 100644
--- a/test/Configure/config-h.py
+++ b/test/Configure/config-h.py
@@ -179,3 +179,9 @@ if expected_config_h != config_h:
     test.fail_test()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/custom-tests.py b/test/Configure/custom-tests.py
index 7fb0ab71..9cefa2da 100644
--- a/test/Configure/custom-tests.py
+++ b/test/Configure/custom-tests.py
@@ -109,3 +109,9 @@ test.checkLogAndStdout(["Executing MyTest ... "],
                        "config.log", ".sconf_temp", "SConstruct")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/from-SConscripts.py b/test/Configure/from-SConscripts.py
index 42cd3d29..59eba535 100644
--- a/test/Configure/from-SConscripts.py
+++ b/test/Configure/from-SConscripts.py
@@ -55,3 +55,9 @@ Return('env')
 test.run(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/help.py b/test/Configure/help.py
index 9abdc619..f42088b7 100644
--- a/test/Configure/help.py
+++ b/test/Configure/help.py
@@ -86,3 +86,9 @@ test.run(arguments = '--help help=1')
 test.must_contain_all_lines(test.stdout(), lines)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/implicit-cache.py b/test/Configure/implicit-cache.py
index 58ae7c9c..0f04b1e4 100644
--- a/test/Configure/implicit-cache.py
+++ b/test/Configure/implicit-cache.py
@@ -101,3 +101,9 @@ if old_sconsign_dblite != new_sconsign_dblite:
     test.fail_test()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/option--Q.py b/test/Configure/option--Q.py
index ab9d4887..198e94fd 100644
--- a/test/Configure/option--Q.py
+++ b/test/Configure/option--Q.py
@@ -44,3 +44,9 @@ env = conf.Finish()
 test.run(arguments='-Q', stdout="scons: `.' is up to date.\n", stderr="")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Configure/option--config.py b/test/Configure/option--config.py
index 3515c96d..1f40a806 100644
--- a/test/Configure/option--config.py
+++ b/test/Configure/option--config.py
@@ -123,3 +123,9 @@ test.checkLogAndStdout( ["Checking for C header file non_system_header0.h... ",
                     "config.log", ".sconf_temp", "SConstruct")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ConstructionEnvironment.py b/test/ConstructionEnvironment.py
index 259a3ce9..bec46b91 100644
--- a/test/ConstructionEnvironment.py
+++ b/test/ConstructionEnvironment.py
@@ -47,3 +47,9 @@ expect = test.wrap_stdout(read_str = "777\n",
 test.run(arguments = '.', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Copy-Action.py b/test/Copy-Action.py
index 252c458c..6e9c54f9 100644
--- a/test/Copy-Action.py
+++ b/test/Copy-Action.py
@@ -185,3 +185,9 @@ if errors:
     test.fail_test()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Copy-Option.py b/test/Copy-Option.py
index 98967622..f06c3b04 100644
--- a/test/Copy-Option.py
+++ b/test/Copy-Option.py
@@ -53,3 +53,9 @@ new_env=env.Clone()
 test.run(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/DMD.py b/test/D/DMD.py
index 47f7c3b4..fd761828 100644
--- a/test/D/DMD.py
+++ b/test/D/DMD.py
@@ -56,3 +56,9 @@ test.run(program=test.workpath('foo'+_exe))
 test.fail_test(not test.stdout() in ["Hello!\n", "Hello!\r\n"])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/D/Scanner.py b/test/D/Scanner.py
index 5c698204..48af057f 100644
--- a/test/D/Scanner.py
+++ b/test/D/Scanner.py
@@ -142,3 +142,9 @@ test.not_up_to_date(arguments = arguments)
 test.up_to_date(arguments = arguments)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DSUFFIXES.py b/test/DSUFFIXES.py
index 93e34f94..bc441a5f 100644
--- a/test/DSUFFIXES.py
+++ b/test/DSUFFIXES.py
@@ -167,3 +167,9 @@ foo.d 2
 test.up_to_date(arguments='.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPDF/DVIPDF.py b/test/DVIPDF/DVIPDF.py
index 43bb1063..5317d5c1 100644
--- a/test/DVIPDF/DVIPDF.py
+++ b/test/DVIPDF/DVIPDF.py
@@ -161,3 +161,9 @@ This is the %s TeX file.
     test.must_exist(test.workpath('bar.pdf'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPDF/DVIPDFCOM.py b/test/DVIPDF/DVIPDFCOM.py
index 0d9cd8d8..1ff5a3d0 100644
--- a/test/DVIPDF/DVIPDFCOM.py
+++ b/test/DVIPDF/DVIPDFCOM.py
@@ -61,3 +61,9 @@ test.must_match('aaa.pdf', "aaa.dvi\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPDF/DVIPDFCOMSTR.py b/test/DVIPDF/DVIPDFCOMSTR.py
index cc0c9095..8b048bb9 100644
--- a/test/DVIPDF/DVIPDFCOMSTR.py
+++ b/test/DVIPDF/DVIPDFCOMSTR.py
@@ -65,3 +65,9 @@ test.must_match('aaa.pdf', "aaa.dvi\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPDF/DVIPDFFLAGS.py b/test/DVIPDF/DVIPDFFLAGS.py
index 8d94b5af..7d7079cc 100644
--- a/test/DVIPDF/DVIPDFFLAGS.py
+++ b/test/DVIPDF/DVIPDFFLAGS.py
@@ -172,3 +172,9 @@ This is the %s LaTeX file.
     test.must_exist(test.workpath('bar.pdf'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPDF/makeindex.py b/test/DVIPDF/makeindex.py
index cfa235fe..22a31be1 100644
--- a/test/DVIPDF/makeindex.py
+++ b/test/DVIPDF/makeindex.py
@@ -69,3 +69,9 @@ test.must_exist(test.workpath('foo.pdf'))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPS/DVIPS.py b/test/DVIPS/DVIPS.py
index b50b3cbb..84821a3a 100644
--- a/test/DVIPS/DVIPS.py
+++ b/test/DVIPS/DVIPS.py
@@ -179,3 +179,9 @@ dvips -o bar3.ps bar3.dvi
     test.must_exist(test.workpath('bar3.ps'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPS/DVIPSFLAGS.py b/test/DVIPS/DVIPSFLAGS.py
index 9fac804c..de8322db 100644
--- a/test/DVIPS/DVIPSFLAGS.py
+++ b/test/DVIPS/DVIPSFLAGS.py
@@ -186,3 +186,9 @@ dvips -o bar3.ps bar3.dvi
     test.must_exist(test.workpath('bar3.ps'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPS/PSCOM.py b/test/DVIPS/PSCOM.py
index 0d8408ec..3e1e5e9f 100644
--- a/test/DVIPS/PSCOM.py
+++ b/test/DVIPS/PSCOM.py
@@ -61,3 +61,9 @@ test.must_match('aaa.ps', "aaa.dvi\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/DVIPS/PSCOMSTR.py b/test/DVIPS/PSCOMSTR.py
index 67f960e5..96814a0d 100644
--- a/test/DVIPS/PSCOMSTR.py
+++ b/test/DVIPS/PSCOMSTR.py
@@ -65,3 +65,9 @@ test.must_match('aaa.ps', "aaa.dvi\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/Environment.py b/test/Decider/Environment.py
index 989e1876..7c609eee 100644
--- a/test/Decider/Environment.py
+++ b/test/Decider/Environment.py
@@ -59,3 +59,9 @@ test.unlink('has-changed')
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/MD5-timestamp.py b/test/Decider/MD5-timestamp.py
index d31a2db3..f8776c3b 100644
--- a/test/Decider/MD5-timestamp.py
+++ b/test/Decider/MD5-timestamp.py
@@ -79,3 +79,9 @@ test.up_to_date(arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/Node.py b/test/Decider/Node.py
index b11e223b..cdd3e358 100644
--- a/test/Decider/Node.py
+++ b/test/Decider/Node.py
@@ -59,3 +59,9 @@ test.unlink('has-changed')
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/default.py b/test/Decider/default.py
index c2886fb1..f05e869b 100644
--- a/test/Decider/default.py
+++ b/test/Decider/default.py
@@ -57,3 +57,9 @@ test.unlink('has-changed')
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/mixed.py b/test/Decider/mixed.py
index 7a83c747..5598468f 100644
--- a/test/Decider/mixed.py
+++ b/test/Decider/mixed.py
@@ -113,3 +113,9 @@ test.unlink('node-has-changed')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/timestamp.py b/test/Decider/timestamp.py
index 69756077..83897451 100644
--- a/test/Decider/timestamp.py
+++ b/test/Decider/timestamp.py
@@ -111,3 +111,9 @@ test.run(arguments = '.', stdout=expect)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Decider/unknown.py b/test/Decider/unknown.py
index b6d071d6..a1ae8253 100644
--- a/test/Decider/unknown.py
+++ b/test/Decider/unknown.py
@@ -44,3 +44,9 @@ scons: \*\*\* Unknown Decider value 'fiddle-dee-dee'
 test.run(arguments = '.', status = 2, stderr = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Default.py b/test/Default.py
index 22fd883f..1b456610 100644
--- a/test/Default.py
+++ b/test/Default.py
@@ -230,3 +230,9 @@ test.fail_test(os.path.exists(test.workpath('eleven', 'bar')))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Delete.py b/test/Delete.py
index 47f9d81e..a7a30622 100644
--- a/test/Delete.py
+++ b/test/Delete.py
@@ -187,3 +187,9 @@ fail_strings = [
 test.must_contain_any_line(test.stderr(), fail_strings)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Depends.py b/test/Depends.py
index 48707395..e3819c53 100644
--- a/test/Depends.py
+++ b/test/Depends.py
@@ -149,3 +149,9 @@ test.write('file3', "file3\n")
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/BuildDir.py b/test/Deprecated/BuildDir.py
index a99d14f9..26987cef 100644
--- a/test/Deprecated/BuildDir.py
+++ b/test/Deprecated/BuildDir.py
@@ -273,3 +273,9 @@ scons: `%s' is up to date.
 """ % test.workpath('build', 'var5')))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/CacheDir/timestamp-content.py b/test/Deprecated/CacheDir/timestamp-content.py
index 850c369a..860d0f3c 100644
--- a/test/Deprecated/CacheDir/timestamp-content.py
+++ b/test/Deprecated/CacheDir/timestamp-content.py
@@ -60,3 +60,9 @@ test.up_to_date(options = '--cache-show --debug=explain', arguments = '.')
 test.up_to_date(options = '--cache-show --debug=explain', arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/CacheDir/timestamp-timestamp.py b/test/Deprecated/CacheDir/timestamp-timestamp.py
index 73dce091..eec70b5f 100644
--- a/test/Deprecated/CacheDir/timestamp-timestamp.py
+++ b/test/Deprecated/CacheDir/timestamp-timestamp.py
@@ -60,3 +60,9 @@ test.up_to_date(options = '--cache-show --debug=explain', arguments = '.')
 test.up_to_date(options = '--cache-show --debug=explain', arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/Copy-Method.py b/test/Deprecated/Copy-Method.py
index f17fc9f9..3864b163 100644
--- a/test/Deprecated/Copy-Method.py
+++ b/test/Deprecated/Copy-Method.py
@@ -50,3 +50,9 @@ test.run(arguments = '--warn=no-deprecated .')
 test.run(arguments = '--warn=no-deprecated-copy .')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/Options/BoolOption.py b/test/Deprecated/Options/BoolOption.py
index 99c2cd7a..57a44c80 100644
--- a/test/Deprecated/Options/BoolOption.py
+++ b/test/Deprecated/Options/BoolOption.py
@@ -93,3 +93,9 @@ test.run(arguments='warnings=irgendwas', stderr=expect_stderr, status=2)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/Options/EnumOption.py b/test/Deprecated/Options/EnumOption.py
index d46b8986..26b14d8c 100644
--- a/test/Deprecated/Options/EnumOption.py
+++ b/test/Deprecated/Options/EnumOption.py
@@ -110,3 +110,9 @@ test.run(arguments='some=IrGeNdwas', stderr=expect_stderr, status=2)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/Options/ListOption.py b/test/Deprecated/Options/ListOption.py
index 369a8e12..28983d25 100644
--- a/test/Deprecated/Options/ListOption.py
+++ b/test/Deprecated/Options/ListOption.py
@@ -183,3 +183,9 @@ test.run(stdout=expect, stderr=warnings)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/Options/Options.py b/test/Deprecated/Options/Options.py
index 1edfa97c..d04ad443 100644
--- a/test/Deprecated/Options/Options.py
+++ b/test/Deprecated/Options/Options.py
@@ -369,3 +369,9 @@ env2 = Environment(options = SCons.Options.Options())
 test.run(stderr=warnings)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/Options/PackageOption.py b/test/Deprecated/Options/PackageOption.py
index 11b8df0d..bb396539 100644
--- a/test/Deprecated/Options/PackageOption.py
+++ b/test/Deprecated/Options/PackageOption.py
@@ -97,3 +97,9 @@ test.run(arguments='x11=/non/existing/path/', stderr=expect_stderr, status=2)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/Options/PathOption.py b/test/Deprecated/Options/PathOption.py
index e53b077d..3c73617c 100644
--- a/test/Deprecated/Options/PathOption.py
+++ b/test/Deprecated/Options/PathOption.py
@@ -289,3 +289,9 @@ test.must_exist(non_existing_subdir)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/Options/chdir.py b/test/Deprecated/Options/chdir.py
index 5d6d3ffb..0db8223a 100644
--- a/test/Deprecated/Options/chdir.py
+++ b/test/Deprecated/Options/chdir.py
@@ -72,3 +72,9 @@ scons: warning: The Options class is deprecated; use the Variables class instead
 test.run(arguments = '-q -Q .', stdout=expect, stderr=warnings)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/Options/help.py b/test/Deprecated/Options/help.py
index 3905c777..9e9adee9 100644
--- a/test/Deprecated/Options/help.py
+++ b/test/Deprecated/Options/help.py
@@ -170,3 +170,9 @@ test.run(arguments='-h', stdout=expected_stdout, stderr=expected_stderr)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/Options/import.py b/test/Deprecated/Options/import.py
index 5a1627ba..a4d56b2f 100644
--- a/test/Deprecated/Options/import.py
+++ b/test/Deprecated/Options/import.py
@@ -70,3 +70,9 @@ scons: warning: The Options class is deprecated; use the Variables class instead
 test.run(arguments = '-q -Q .', stdout = stdout, stderr = stderr)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/SConscript-build_dir.py b/test/Deprecated/SConscript-build_dir.py
index 1e623af0..d54f3afd 100644
--- a/test/Deprecated/SConscript-build_dir.py
+++ b/test/Deprecated/SConscript-build_dir.py
@@ -272,3 +272,9 @@ test.run(chdir='test3')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/SourceSignatures/basic.py b/test/Deprecated/SourceSignatures/basic.py
index 2bfdd659..1340bc4a 100644
--- a/test/Deprecated/SourceSignatures/basic.py
+++ b/test/Deprecated/SourceSignatures/basic.py
@@ -127,3 +127,9 @@ test.up_to_date(arguments = 'f1.out f2.out f3.out f4.out', stderr = None)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/SourceSignatures/env.py b/test/Deprecated/SourceSignatures/env.py
index 12a596fb..b2d6241b 100644
--- a/test/Deprecated/SourceSignatures/env.py
+++ b/test/Deprecated/SourceSignatures/env.py
@@ -98,3 +98,9 @@ test.up_to_date(arguments = 'f1.out f2.out f3.out f4.out', stderr = None)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/SourceSignatures/implicit-cache.py b/test/Deprecated/SourceSignatures/implicit-cache.py
index 44c30ce4..3911e25a 100644
--- a/test/Deprecated/SourceSignatures/implicit-cache.py
+++ b/test/Deprecated/SourceSignatures/implicit-cache.py
@@ -96,3 +96,9 @@ test.up_to_date(arguments = 'both.out', stderr = None)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/SourceSignatures/no-csigs.py b/test/Deprecated/SourceSignatures/no-csigs.py
index be9cb092..5f47d9b3 100644
--- a/test/Deprecated/SourceSignatures/no-csigs.py
+++ b/test/Deprecated/SourceSignatures/no-csigs.py
@@ -70,3 +70,9 @@ test.run_sconsign(arguments = test.workpath('.sconsign'),
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/SourceSignatures/overrides.py b/test/Deprecated/SourceSignatures/overrides.py
index de1cc95b..63ee095a 100644
--- a/test/Deprecated/SourceSignatures/overrides.py
+++ b/test/Deprecated/SourceSignatures/overrides.py
@@ -57,3 +57,9 @@ test.not_up_to_date(arguments = 'foo.out',
                     stderr = TestSCons.deprecated_python_expr)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/SourceSignatures/switch-rebuild.py b/test/Deprecated/SourceSignatures/switch-rebuild.py
index 07b59fb4..c8e64e39 100644
--- a/test/Deprecated/SourceSignatures/switch-rebuild.py
+++ b/test/Deprecated/SourceSignatures/switch-rebuild.py
@@ -86,3 +86,9 @@ test.run(arguments = 'switch.out',
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/TargetSignatures/build-content.py b/test/Deprecated/TargetSignatures/build-content.py
index 6fd031e4..7cf8ab87 100644
--- a/test/Deprecated/TargetSignatures/build-content.py
+++ b/test/Deprecated/TargetSignatures/build-content.py
@@ -129,3 +129,9 @@ copy1(["foo.out"], ["foo.mid"])
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/TargetSignatures/content.py b/test/Deprecated/TargetSignatures/content.py
index 4de14224..3b2638f6 100644
--- a/test/Deprecated/TargetSignatures/content.py
+++ b/test/Deprecated/TargetSignatures/content.py
@@ -81,3 +81,9 @@ test.must_match('final', "foo.in\nbar.in\nextra.in 1\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/TargetSignatures/overrides.py b/test/Deprecated/TargetSignatures/overrides.py
index 327218ec..055c06be 100644
--- a/test/Deprecated/TargetSignatures/overrides.py
+++ b/test/Deprecated/TargetSignatures/overrides.py
@@ -52,3 +52,9 @@ test.must_match('foo.mid', "foo.in\n")
 test.must_match('foo.out', "foo.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/TaskmasterNeedsExecute.py b/test/Deprecated/TaskmasterNeedsExecute.py
index 6aedf599..95e37b22 100644
--- a/test/Deprecated/TaskmasterNeedsExecute.py
+++ b/test/Deprecated/TaskmasterNeedsExecute.py
@@ -56,3 +56,9 @@ test.run(arguments = '--warn=future-deprecated .',
          stderr = TestSCons.re_escape(expect) + TestSCons.file_expr)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/debug-dtree.py b/test/Deprecated/debug-dtree.py
index 3a772d7d..1e7366f8 100644
--- a/test/Deprecated/debug-dtree.py
+++ b/test/Deprecated/debug-dtree.py
@@ -112,3 +112,9 @@ test.run(arguments = "--debug=dtree foo.xxx",
 test.must_contain_all_lines(test.stdout(), [dtree1])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/debug-nomemoizer.py b/test/Deprecated/debug-nomemoizer.py
index 3a927e5a..c533efae 100644
--- a/test/Deprecated/debug-nomemoizer.py
+++ b/test/Deprecated/debug-nomemoizer.py
@@ -50,3 +50,9 @@ test.run(arguments = "--debug=nomemoizer", stderr = expect)
 test.must_match('file.out', "file.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/debug-stree.py b/test/Deprecated/debug-stree.py
index 714b5b3a..43a370ac 100644
--- a/test/Deprecated/debug-stree.py
+++ b/test/Deprecated/debug-stree.py
@@ -133,3 +133,9 @@ test.run(arguments = "--no-exec --debug=stree foo.xxx",
 test.fail_test(string.count(test.stdout(), stree2) != 1)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/debug-tree.py b/test/Deprecated/debug-tree.py
index 833abd5b..51ff7f29 100644
--- a/test/Deprecated/debug-tree.py
+++ b/test/Deprecated/debug-tree.py
@@ -152,3 +152,9 @@ test.run(arguments = "--debug=tree Foo.xxx",
 test.must_contain_all_lines(test.stdout(), tree1)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Dir/Dir.py b/test/Dir/Dir.py
index d7ec9ae7..af0a10b0 100644
--- a/test/Dir/Dir.py
+++ b/test/Dir/Dir.py
@@ -72,3 +72,9 @@ env.MD(target='sub2', source=['SConstruct'], OVERRIDE='foo')
 test.run()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Dir/mixed-targets.py b/test/Dir/mixed-targets.py
index 52f9f0ab..9702e400 100644
--- a/test/Dir/mixed-targets.py
+++ b/test/Dir/mixed-targets.py
@@ -68,3 +68,9 @@ test.must_match(['build', 'dir', 'file2'],  "src/dir/file2\n")
 test.must_match(['build', 'dir', 'file3'],  "src/dir/file3\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Dir/source.py b/test/Dir/source.py
index c797246a..8dbee1af 100644
--- a/test/Dir/source.py
+++ b/test/Dir/source.py
@@ -167,3 +167,9 @@ test.not_up_to_date(arguments='tstamp.out')
 test.not_up_to_date(arguments='content.out')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ENV.py b/test/ENV.py
index d7c543da..f6d10129 100644
--- a/test/ENV.py
+++ b/test/ENV.py
@@ -87,3 +87,9 @@ expect = [
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ESCAPE.py b/test/ESCAPE.py
index 08f4a1a4..68835f1a 100644
--- a/test/ESCAPE.py
+++ b/test/ESCAPE.py
@@ -63,3 +63,9 @@ test.run()
 test.must_match('file.out', "file.xxx\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/EnsurePythonVersion.py b/test/EnsurePythonVersion.py
index af59b52f..8e1a0f3b 100644
--- a/test/EnsurePythonVersion.py
+++ b/test/EnsurePythonVersion.py
@@ -98,3 +98,9 @@ test.run(status=2)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/EnsureSConsVersion.py b/test/EnsureSConsVersion.py
index 77e6ba2f..f9674564 100644
--- a/test/EnsureSConsVersion.py
+++ b/test/EnsureSConsVersion.py
@@ -124,3 +124,9 @@ test.run(status=2)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Entry.py b/test/Entry.py
index 55fa90b7..3767cc5a 100644
--- a/test/Entry.py
+++ b/test/Entry.py
@@ -56,3 +56,9 @@ scons: `.' is up to date.
 """))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Environment.py b/test/Environment.py
index 36c72e11..18a75dd3 100644
--- a/test/Environment.py
+++ b/test/Environment.py
@@ -60,3 +60,9 @@ test.write('foo.in', "foo.in\n")
 test.run(arguments='foo.out')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/AttributeError.py b/test/Errors/AttributeError.py
index 637cccfc..c666a2dc 100644
--- a/test/Errors/AttributeError.py
+++ b/test/Errors/AttributeError.py
@@ -45,3 +45,9 @@ test.run(status = 2, stderr = """\
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/Exception.py b/test/Errors/Exception.py
index 61bd74f6..cc36035a 100644
--- a/test/Errors/Exception.py
+++ b/test/Errors/Exception.py
@@ -74,3 +74,9 @@ expect = "scons: `foo.out' is up to date."
 test.must_contain_all_lines(test.stdout(), [expect])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/InternalError.py b/test/Errors/InternalError.py
index e90d4026..032c7a72 100644
--- a/test/Errors/InternalError.py
+++ b/test/Errors/InternalError.py
@@ -51,3 +51,9 @@ InternalError: error inside
 """, status=2)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/NameError.py b/test/Errors/NameError.py
index be69b507..0281253d 100644
--- a/test/Errors/NameError.py
+++ b/test/Errors/NameError.py
@@ -45,3 +45,9 @@ NameError: [^\n]*
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/SyntaxError.py b/test/Errors/SyntaxError.py
index 956caa7d..08539ad5 100644
--- a/test/Errors/SyntaxError.py
+++ b/test/Errors/SyntaxError.py
@@ -51,3 +51,9 @@ SyntaxError: invalid syntax
 """, status=2)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/TypeError.py b/test/Errors/TypeError.py
index 1ec14dd8..286fa262 100644
--- a/test/Errors/TypeError.py
+++ b/test/Errors/TypeError.py
@@ -45,3 +45,9 @@ TypeError:( 'int')? object does not support item assignment:
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/UserError.py b/test/Errors/UserError.py
index 69ed7d44..c534ed60 100644
--- a/test/Errors/UserError.py
+++ b/test/Errors/UserError.py
@@ -48,3 +48,9 @@ test.run(stdout = "scons: Reading SConscript files ...\n",
          status=2)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/execute-a-directory.py b/test/Errors/execute-a-directory.py
index a13b4e06..e02dcb05 100644
--- a/test/Errors/execute-a-directory.py
+++ b/test/Errors/execute-a-directory.py
@@ -102,3 +102,9 @@ else:
     test.must_contain_any_line(test.stderr(), errs)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/exit-status.py b/test/Errors/exit-status.py
index 946c1c40..554f394f 100644
--- a/test/Errors/exit-status.py
+++ b/test/Errors/exit-status.py
@@ -52,3 +52,9 @@ test.write('foo.in', "foo.in\n")
 test.run(status=2, stderr="scons: \\*\\*\\* \\[one.out\\] Error 7\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/non-executable-file.py b/test/Errors/non-executable-file.py
index 3d5cd5bc..dc6b6063 100644
--- a/test/Errors/non-executable-file.py
+++ b/test/Errors/non-executable-file.py
@@ -96,3 +96,9 @@ else:
     test.must_contain_any_line(test.stderr(), errs)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/nonexistent-executable.py b/test/Errors/nonexistent-executable.py
index c2f7cfdb..ab6d1186 100644
--- a/test/Errors/nonexistent-executable.py
+++ b/test/Errors/nonexistent-executable.py
@@ -100,3 +100,9 @@ else:
     test.must_contain_any_line(test.stderr(), errs)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/permission-denied.py b/test/Errors/permission-denied.py
index 05d1e9d5..01348032 100644
--- a/test/Errors/permission-denied.py
+++ b/test/Errors/permission-denied.py
@@ -62,3 +62,9 @@ errs = [
 test.fail_test(test.stderr() not in errs)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/preparation.py b/test/Errors/preparation.py
index 597216aa..914827a7 100644
--- a/test/Errors/preparation.py
+++ b/test/Errors/preparation.py
@@ -73,3 +73,9 @@ test.run(chdir = 'work',
          stderr = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Execute.py b/test/Execute.py
index 19583ca4..409594cb 100644
--- a/test/Execute.py
+++ b/test/Execute.py
@@ -123,3 +123,9 @@ test.must_match('l.out', "l.in\n")
 test.must_match('m.out', "m.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ExecuteInvalidateCache.py b/test/ExecuteInvalidateCache.py
index 9c328a73..88ae3939 100644
--- a/test/ExecuteInvalidateCache.py
+++ b/test/ExecuteInvalidateCache.py
@@ -106,3 +106,9 @@ Touch("%(subfn)s")
 test.run(arguments = '.', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Exit.py b/test/Exit.py
index 570b6db2..98d6bbaf 100644
--- a/test/Exit.py
+++ b/test/Exit.py
@@ -155,3 +155,9 @@ test.run(status = 37,
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/File.py b/test/File.py
index 583e6b4d..d919884b 100644
--- a/test/File.py
+++ b/test/File.py
@@ -66,3 +66,9 @@ scons: `.' is up to date.
 test.run(stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/FindFile.py b/test/FindFile.py
index 8f6cb1ac..5d198ac6 100644
--- a/test/FindFile.py
+++ b/test/FindFile.py
@@ -63,3 +63,8 @@ test.run(arguments = ".", stdout = expect)
 
 test.pass_test()
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Flatten.py b/test/Flatten.py
index 1b98f669..2fae80b2 100644
--- a/test/Flatten.py
+++ b/test/Flatten.py
@@ -80,3 +80,9 @@ test.run(chdir = "work",
                                    build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F77.py b/test/Fortran/F77.py
index 0d3d8b4f..2dc1bbfe 100644
--- a/test/Fortran/F77.py
+++ b/test/Fortran/F77.py
@@ -146,3 +146,9 @@ bar.Program(target = 'bar', source = 'bar.f')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F77COM.py b/test/Fortran/F77COM.py
index 413c1861..1efbe05a 100644
--- a/test/Fortran/F77COM.py
+++ b/test/Fortran/F77COM.py
@@ -90,3 +90,9 @@ test.must_match('test09' + _exe, "This is a .f77 file.\n")
 test.must_match('test10' + _exe, "This is a .F77 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F77COMSTR.py b/test/Fortran/F77COMSTR.py
index 2590cf44..502473a1 100644
--- a/test/Fortran/F77COMSTR.py
+++ b/test/Fortran/F77COMSTR.py
@@ -70,3 +70,9 @@ test.must_match('test09.obj', "A .f77 file.\n")
 test.must_match('test10.obj', "A .F77 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F77FILESUFFIXES.py b/test/Fortran/F77FILESUFFIXES.py
index ff1f2334..2070ff2e 100644
--- a/test/Fortran/F77FILESUFFIXES.py
+++ b/test/Fortran/F77FILESUFFIXES.py
@@ -93,3 +93,9 @@ test.must_match('test09' + _exe, "This is a .f77 file.\n")
 test.must_match('test10' + _exe, "This is a .F77 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F77FILESUFFIXES2.py b/test/Fortran/F77FILESUFFIXES2.py
index afbdbbeb..52e4d686 100644
--- a/test/Fortran/F77FILESUFFIXES2.py
+++ b/test/Fortran/F77FILESUFFIXES2.py
@@ -77,3 +77,9 @@ test.must_match('test05' + _exe, "This is a .f95 file.\n")
 test.must_match('test06' + _exe, "This is a .F95 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F77FLAGS.py b/test/Fortran/F77FLAGS.py
index 1ad27f50..70ef51c9 100644
--- a/test/Fortran/F77FLAGS.py
+++ b/test/Fortran/F77FLAGS.py
@@ -127,3 +127,9 @@ bar.Program(target = 'bar', source = 'bar.f')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F77PATH.py b/test/Fortran/F77PATH.py
index cc627197..260782cf 100644
--- a/test/Fortran/F77PATH.py
+++ b/test/Fortran/F77PATH.py
@@ -309,3 +309,9 @@ test.run(arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F90.py b/test/Fortran/F90.py
index 04ce465a..7c31ee6f 100644
--- a/test/Fortran/F90.py
+++ b/test/Fortran/F90.py
@@ -143,3 +143,9 @@ bar.Program(target = 'bar', source = 'bar.f90')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F90COM.py b/test/Fortran/F90COM.py
index 53f99d0c..8981bb37 100644
--- a/test/Fortran/F90COM.py
+++ b/test/Fortran/F90COM.py
@@ -102,3 +102,9 @@ test.must_match('test21' + _exe, "This is a .f90 file.\n")
 test.must_match('test22' + _exe, "This is a .F90 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F90COMSTR.py b/test/Fortran/F90COMSTR.py
index 2ab1b3e2..eec5795d 100644
--- a/test/Fortran/F90COMSTR.py
+++ b/test/Fortran/F90COMSTR.py
@@ -69,3 +69,9 @@ test.must_match('test01.obj', "A .f90 file.\n")
 test.must_match('test02.obj', "A .F90 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F90FILESUFFIXES.py b/test/Fortran/F90FILESUFFIXES.py
index 5c66f3bd..ae61a84f 100644
--- a/test/Fortran/F90FILESUFFIXES.py
+++ b/test/Fortran/F90FILESUFFIXES.py
@@ -93,3 +93,9 @@ test.must_match('test09' + _exe, "This is a .f90 file.\n")
 test.must_match('test10' + _exe, "This is a .F90 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F90FILESUFFIXES2.py b/test/Fortran/F90FILESUFFIXES2.py
index 408f276b..ab62ca7e 100644
--- a/test/Fortran/F90FILESUFFIXES2.py
+++ b/test/Fortran/F90FILESUFFIXES2.py
@@ -83,3 +83,9 @@ test.must_match('test05' + _exe, "This is a .f77 file.\n")
 test.must_match('test06' + _exe, "This is a .F77 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F90FLAGS.py b/test/Fortran/F90FLAGS.py
index c2672a7c..5f8df8d5 100644
--- a/test/Fortran/F90FLAGS.py
+++ b/test/Fortran/F90FLAGS.py
@@ -150,3 +150,9 @@ bar.Program(target = 'bar', source = 'bar.f90')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F90PATH.py b/test/Fortran/F90PATH.py
index d8f73f42..341b2412 100644
--- a/test/Fortran/F90PATH.py
+++ b/test/Fortran/F90PATH.py
@@ -299,3 +299,9 @@ test.up_to_date(arguments = args)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F95.py b/test/Fortran/F95.py
index d9bbfe21..eeadac7e 100644
--- a/test/Fortran/F95.py
+++ b/test/Fortran/F95.py
@@ -148,3 +148,9 @@ bar.Program(target = 'bar', source = 'bar.f95')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F95COM.py b/test/Fortran/F95COM.py
index bac7a862..6ef6eb07 100644
--- a/test/Fortran/F95COM.py
+++ b/test/Fortran/F95COM.py
@@ -102,3 +102,9 @@ test.must_match('test21' + _exe, "This is a .f95 file.\n")
 test.must_match('test22' + _exe, "This is a .F95 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F95COMSTR.py b/test/Fortran/F95COMSTR.py
index 029d9872..1f9734a5 100644
--- a/test/Fortran/F95COMSTR.py
+++ b/test/Fortran/F95COMSTR.py
@@ -70,3 +70,9 @@ test.must_match('test01.obj', "A .f95 file.\n")
 test.must_match('test02.obj', "A .F95 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F95FILESUFFIXES.py b/test/Fortran/F95FILESUFFIXES.py
index beefb282..119629df 100644
--- a/test/Fortran/F95FILESUFFIXES.py
+++ b/test/Fortran/F95FILESUFFIXES.py
@@ -93,3 +93,9 @@ test.must_match('test09' + _exe, "This is a .f95 file.\n")
 test.must_match('test10' + _exe, "This is a .F95 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F95FILESUFFIXES2.py b/test/Fortran/F95FILESUFFIXES2.py
index 59fd9b63..d89839ba 100644
--- a/test/Fortran/F95FILESUFFIXES2.py
+++ b/test/Fortran/F95FILESUFFIXES2.py
@@ -83,3 +83,9 @@ test.must_match('test05' + _exe, "This is a .f77 file.\n")
 test.must_match('test06' + _exe, "This is a .F77 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/F95FLAGS.py b/test/Fortran/F95FLAGS.py
index 4b9ef83e..86fd9f54 100644
--- a/test/Fortran/F95FLAGS.py
+++ b/test/Fortran/F95FLAGS.py
@@ -155,3 +155,9 @@ bar.Program(target = 'bar', source = 'bar.f95')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRAN.py b/test/Fortran/FORTRAN.py
index edd50a0b..96f2749c 100644
--- a/test/Fortran/FORTRAN.py
+++ b/test/Fortran/FORTRAN.py
@@ -141,3 +141,9 @@ bar.Program(target = 'bar', source = 'bar.f')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANCOM.py b/test/Fortran/FORTRANCOM.py
index 472a88db..6948b965 100644
--- a/test/Fortran/FORTRANCOM.py
+++ b/test/Fortran/FORTRANCOM.py
@@ -82,3 +82,9 @@ test.must_match('test07' + _exe, "This is a .fpp file.\n")
 test.must_match('test08' + _exe, "This is a .FPP file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANCOMSTR.py b/test/Fortran/FORTRANCOMSTR.py
index 1f3e2915..ba923d34 100644
--- a/test/Fortran/FORTRANCOMSTR.py
+++ b/test/Fortran/FORTRANCOMSTR.py
@@ -94,3 +94,9 @@ test.must_match('test07.obj', "A .fpp file.\n")
 test.must_match('test08.obj', "A .FPP file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANFILESUFFIXES.py b/test/Fortran/FORTRANFILESUFFIXES.py
index dfdad020..92e30ead 100644
--- a/test/Fortran/FORTRANFILESUFFIXES.py
+++ b/test/Fortran/FORTRANFILESUFFIXES.py
@@ -86,3 +86,9 @@ test.must_match('test07' + _exe, "This is a .fpp file.\n")
 test.must_match('test08' + _exe, "This is a .FPP file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANFILESUFFIXES2.py b/test/Fortran/FORTRANFILESUFFIXES2.py
index 14656896..8ba09623 100644
--- a/test/Fortran/FORTRANFILESUFFIXES2.py
+++ b/test/Fortran/FORTRANFILESUFFIXES2.py
@@ -81,3 +81,9 @@ test.must_match('test04' + _exe, "This is a .ffake file.\n")
 test.must_match('test05' + _exe, "This is a .f77 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANFLAGS.py b/test/Fortran/FORTRANFLAGS.py
index 4f140a80..3424bfd8 100644
--- a/test/Fortran/FORTRANFLAGS.py
+++ b/test/Fortran/FORTRANFLAGS.py
@@ -145,3 +145,9 @@ bar.Program(target = 'bar', source = 'bar.f')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANMODDIR.py b/test/Fortran/FORTRANMODDIR.py
index 62e3935a..96a341a1 100644
--- a/test/Fortran/FORTRANMODDIR.py
+++ b/test/Fortran/FORTRANMODDIR.py
@@ -99,3 +99,9 @@ test.up_to_date(arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANPATH.py b/test/Fortran/FORTRANPATH.py
index bf99b5b9..ee01aeef 100644
--- a/test/Fortran/FORTRANPATH.py
+++ b/test/Fortran/FORTRANPATH.py
@@ -327,3 +327,9 @@ else:
     test.run(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/FORTRANSUFFIXES.py b/test/Fortran/FORTRANSUFFIXES.py
index 353405b9..583b71b8 100644
--- a/test/Fortran/FORTRANSUFFIXES.py
+++ b/test/Fortran/FORTRANSUFFIXES.py
@@ -164,3 +164,9 @@ test.must_match('test1.o', """\
 test.up_to_date(arguments='.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF77.py b/test/Fortran/SHF77.py
index 63bca4de..9cc569ad 100644
--- a/test/Fortran/SHF77.py
+++ b/test/Fortran/SHF77.py
@@ -140,3 +140,9 @@ bar.SharedObject(target = 'bar/bar', source = 'bar.f')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF77COM.py b/test/Fortran/SHF77COM.py
index 1e35b200..c99207fb 100644
--- a/test/Fortran/SHF77COM.py
+++ b/test/Fortran/SHF77COM.py
@@ -89,3 +89,9 @@ test.must_match(obj_ + 'test09' + _obj, "This is a .f77 file.\n")
 test.must_match(obj_ + 'test10' + _obj, "This is a .F77 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF77COMSTR.py b/test/Fortran/SHF77COMSTR.py
index ec698be2..9ca6631d 100644
--- a/test/Fortran/SHF77COMSTR.py
+++ b/test/Fortran/SHF77COMSTR.py
@@ -78,3 +78,9 @@ test.must_match('test09.shobj', "A .f77 file.\n")
 test.must_match('test10.shobj', "A .F77 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF77FLAGS.py b/test/Fortran/SHF77FLAGS.py
index aac7b9de..f3939b62 100644
--- a/test/Fortran/SHF77FLAGS.py
+++ b/test/Fortran/SHF77FLAGS.py
@@ -123,3 +123,9 @@ bar.SharedLibrary(target = 'bar/bar', source = 'bar.f')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF90.py b/test/Fortran/SHF90.py
index ea673133..00e9d2af 100644
--- a/test/Fortran/SHF90.py
+++ b/test/Fortran/SHF90.py
@@ -140,3 +140,9 @@ bar.SharedObject(target = 'bar/bar', source = 'bar.f90')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF90COM.py b/test/Fortran/SHF90COM.py
index fab31939..415cb9b6 100644
--- a/test/Fortran/SHF90COM.py
+++ b/test/Fortran/SHF90COM.py
@@ -99,3 +99,9 @@ test.must_match(obj_ + 'test21' + _obj, "This is a .f90 file.\n")
 test.must_match(obj_ + 'test22' + _obj, "This is a .F90 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF90COMSTR.py b/test/Fortran/SHF90COMSTR.py
index f52d2f20..61045eea 100644
--- a/test/Fortran/SHF90COMSTR.py
+++ b/test/Fortran/SHF90COMSTR.py
@@ -70,3 +70,9 @@ test.must_match('test01.shobj', "A .f90 file.\n")
 test.must_match('test02.shobj', "A .F90 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF90FLAGS.py b/test/Fortran/SHF90FLAGS.py
index 5e8e996c..88ae6560 100644
--- a/test/Fortran/SHF90FLAGS.py
+++ b/test/Fortran/SHF90FLAGS.py
@@ -146,3 +146,9 @@ bar.SharedLibrary(target = 'bar/bar', source = 'bar.f90')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF95.py b/test/Fortran/SHF95.py
index 18f03b25..a6b1f6d1 100644
--- a/test/Fortran/SHF95.py
+++ b/test/Fortran/SHF95.py
@@ -141,3 +141,9 @@ bar.SharedObject(target = 'bar/bar', source = 'bar.f95')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF95COM.py b/test/Fortran/SHF95COM.py
index 26557e55..0984b20c 100644
--- a/test/Fortran/SHF95COM.py
+++ b/test/Fortran/SHF95COM.py
@@ -99,3 +99,9 @@ test.must_match(obj_ + 'test21' + _obj, "This is a .f95 file.\n")
 test.must_match(obj_ + 'test22' + _obj, "This is a .F95 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF95COMSTR.py b/test/Fortran/SHF95COMSTR.py
index fdc176ff..01247276 100644
--- a/test/Fortran/SHF95COMSTR.py
+++ b/test/Fortran/SHF95COMSTR.py
@@ -70,3 +70,9 @@ test.must_match('test01.shobj', "A .f95 file.\n")
 test.must_match('test02.shobj', "A .F95 file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHF95FLAGS.py b/test/Fortran/SHF95FLAGS.py
index 50f61d62..e3d36a04 100644
--- a/test/Fortran/SHF95FLAGS.py
+++ b/test/Fortran/SHF95FLAGS.py
@@ -150,3 +150,9 @@ bar.SharedLibrary(target = 'bar/bar', source = 'bar.f95')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHFORTRAN.py b/test/Fortran/SHFORTRAN.py
index d6f428dd..2e4bd61e 100644
--- a/test/Fortran/SHFORTRAN.py
+++ b/test/Fortran/SHFORTRAN.py
@@ -135,3 +135,9 @@ bar.SharedObject(target = 'bar/bar', source = 'bar.f')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHFORTRANCOM.py b/test/Fortran/SHFORTRANCOM.py
index 222cb89a..f89358da 100644
--- a/test/Fortran/SHFORTRANCOM.py
+++ b/test/Fortran/SHFORTRANCOM.py
@@ -81,3 +81,9 @@ test.must_match(obj_ + 'test07' + _obj, "This is a .fpp file.\n")
 test.must_match(obj_ + 'test08' + _obj, "This is a .FPP file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHFORTRANCOMSTR.py b/test/Fortran/SHFORTRANCOMSTR.py
index 7d313926..a2cf47cb 100644
--- a/test/Fortran/SHFORTRANCOMSTR.py
+++ b/test/Fortran/SHFORTRANCOMSTR.py
@@ -94,3 +94,9 @@ test.must_match('test07.shobj', "A .fpp file.\n")
 test.must_match('test08.shobj', "A .FPP file.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/SHFORTRANFLAGS.py b/test/Fortran/SHFORTRANFLAGS.py
index 1ec215d7..90f0c65a 100644
--- a/test/Fortran/SHFORTRANFLAGS.py
+++ b/test/Fortran/SHFORTRANFLAGS.py
@@ -138,3 +138,9 @@ bar.SharedLibrary(target = 'bar/bar', source = 'bar.f')
     test.must_match('wrapper.out', "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/USE-MODULE.py b/test/Fortran/USE-MODULE.py
index 99b7d693..26669926 100644
--- a/test/Fortran/USE-MODULE.py
+++ b/test/Fortran/USE-MODULE.py
@@ -87,3 +87,9 @@ test.up_to_date(arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/common.py b/test/Fortran/common.py
index 0d991b67..fe3f46c5 100644
--- a/test/Fortran/common.py
+++ b/test/Fortran/common.py
@@ -64,3 +64,9 @@ for l in infile.readlines():
         outfile.write(l)
 sys.exit(0)
     """)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/link-with-cxx.py b/test/Fortran/link-with-cxx.py
index ae0ff67c..a29558e5 100644
--- a/test/Fortran/link-with-cxx.py
+++ b/test/Fortran/link-with-cxx.py
@@ -147,3 +147,9 @@ test.must_match('prog1.exe', "f1.cpp\nf2.f\n")
 test.must_match('prog2.exe', "f1.cpp\nf2.f\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Fortran/module-subdir.py b/test/Fortran/module-subdir.py
index 32f283fd..def1e5cb 100644
--- a/test/Fortran/module-subdir.py
+++ b/test/Fortran/module-subdir.py
@@ -112,3 +112,9 @@ expect = "myfortran.py wrote %s\n" % somemodule
 test.must_match(['subdir', 'build', 'somemodule.mod'], expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/GetBuildFailures/option-k.py b/test/GetBuildFailures/option-k.py
index 5246f314..532c3792 100644
--- a/test/GetBuildFailures/option-k.py
+++ b/test/GetBuildFailures/option-k.py
@@ -110,3 +110,9 @@ test.must_match(test.workpath('f6'), 'f6.in\n')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/GetBuildFailures/parallel.py b/test/GetBuildFailures/parallel.py
index 69987301..6ee5cc35 100644
--- a/test/GetBuildFailures/parallel.py
+++ b/test/GetBuildFailures/parallel.py
@@ -140,3 +140,9 @@ test.must_match(test.workpath('f6'), 'f6.in\n')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/GetBuildFailures/serial.py b/test/GetBuildFailures/serial.py
index 3c11be81..d3a9f77a 100644
--- a/test/GetBuildFailures/serial.py
+++ b/test/GetBuildFailures/serial.py
@@ -237,3 +237,9 @@ test.must_not_exist(test.workpath('f15'))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/GetOption/help.py b/test/GetOption/help.py
index 37f95559..f20704e0 100644
--- a/test/GetOption/help.py
+++ b/test/GetOption/help.py
@@ -52,3 +52,9 @@ test.run(arguments = '-q -Q --help')
 test.fail_test(string.split(test.stdout(), '\n')[0] != expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/GetSetOption.py b/test/GetSetOption.py
index 4c1fadd6..929f8d05 100644
--- a/test/GetSetOption.py
+++ b/test/GetSetOption.py
@@ -51,3 +51,9 @@ for option in option_list:
 test.run(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Ghostscript/GS.py b/test/Ghostscript/GS.py
index ab253696..c2e5dd73 100644
--- a/test/Ghostscript/GS.py
+++ b/test/Ghostscript/GS.py
@@ -115,3 +115,9 @@ bar.PDF(target = 'bar.pdf', source = 'bar.ps')
     test.fail_test(not os.path.exists(test.workpath('bar.pdf')))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Ghostscript/GSCOM.py b/test/Ghostscript/GSCOM.py
index a41c8005..b43bc199 100644
--- a/test/Ghostscript/GSCOM.py
+++ b/test/Ghostscript/GSCOM.py
@@ -61,3 +61,9 @@ test.must_match('aaa.pdf', "aaa.ps\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Ghostscript/GSCOMSTR.py b/test/Ghostscript/GSCOMSTR.py
index 923aee39..acd1132b 100644
--- a/test/Ghostscript/GSCOMSTR.py
+++ b/test/Ghostscript/GSCOMSTR.py
@@ -65,3 +65,9 @@ test.must_match('aaa.pdf', "aaa.ps\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Ghostscript/GSFLAGS.py b/test/Ghostscript/GSFLAGS.py
index eab925d8..057977e6 100644
--- a/test/Ghostscript/GSFLAGS.py
+++ b/test/Ghostscript/GSFLAGS.py
@@ -111,3 +111,9 @@ foo.PDF(target = 'foo.pdf', source = 'foo.ps')
     test.fail_test(not os.path.exists(test.workpath('foo.pdf')))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/Repository.py b/test/Glob/Repository.py
index bef9bdac..2b0a5bb1 100644
--- a/test/Glob/Repository.py
+++ b/test/Glob/Repository.py
@@ -121,3 +121,9 @@ test.must_match(['work', 'ccc.out'], "repository/ccc.in\n")
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/VariantDir.py b/test/Glob/VariantDir.py
index 5f29b21a..62226ce0 100644
--- a/test/Glob/VariantDir.py
+++ b/test/Glob/VariantDir.py
@@ -69,3 +69,9 @@ test.must_match(['var1', 'f.out'], "src/f1.in\nsrc/f2.in\nsrc/f3.in\n")
 test.must_match(['var2', 'f.out'], "src/f1.in\nsrc/f2.in\nsrc/f3.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/basic.py b/test/Glob/basic.py
index 2e7427a3..d985a735 100644
--- a/test/Glob/basic.py
+++ b/test/Glob/basic.py
@@ -57,3 +57,9 @@ test.run(arguments = '.')
 test.must_match('f.out', "f1.in\nf2.in\nf3.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/glob-libpath.py b/test/Glob/glob-libpath.py
index 1effcc19..b09aab95 100644
--- a/test/Glob/glob-libpath.py
+++ b/test/Glob/glob-libpath.py
@@ -84,3 +84,9 @@ if test.match_re_dotall(test.stdout(), r".*(-L|/LIBPATH:)src[/\\]util.*"):
     test.fail_test()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/source.py b/test/Glob/source.py
index 4142fc04..33baf371 100644
--- a/test/Glob/source.py
+++ b/test/Glob/source.py
@@ -86,3 +86,9 @@ test.must_match(['var1', 'f.out'], "src/f4.in\nsrc/f5.in\n")
 test.must_match(['var2', 'f.out'], "src/f6.in\nsrc/f7.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/strings.py b/test/Glob/strings.py
index 48527905..1ef04214 100644
--- a/test/Glob/strings.py
+++ b/test/Glob/strings.py
@@ -70,3 +70,9 @@ test.must_match(['var1', 'f.out'], "src/f1.in\nsrc/f2.in\nsrc/f3.in\n")
 test.must_match(['var2', 'f.out'], "src/f1.in\nsrc/f2.in\nsrc/f3.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/subdir.py b/test/Glob/subdir.py
index b4e89e8a..0255ff83 100644
--- a/test/Glob/subdir.py
+++ b/test/Glob/subdir.py
@@ -58,3 +58,9 @@ test.run(arguments = '.')
 test.must_match('f.out', "subdir/file.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Glob/subst.py b/test/Glob/subst.py
index e6aa3ca9..abf2bb4f 100644
--- a/test/Glob/subst.py
+++ b/test/Glob/subst.py
@@ -58,3 +58,9 @@ test.run(arguments = '.')
 test.must_match('f.out', "f1.in\nf2.in\nf3.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/HeaderGen.py b/test/HeaderGen.py
index a47d22cc..5a7fdbe0 100644
--- a/test/HeaderGen.py
+++ b/test/HeaderGen.py
@@ -83,3 +83,9 @@ void a(void)
 test.run()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/HeaderInstall.py b/test/HeaderInstall.py
index 84a6a4a6..071a0f43 100644
--- a/test/HeaderInstall.py
+++ b/test/HeaderInstall.py
@@ -114,3 +114,9 @@ test.must_match(['work2', 'build', 'in3.h'], src_in3_h)
 test.up_to_date(chdir = 'work2', arguments = 'build')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Help.py b/test/Help.py
index d6e71ea3..747fe597 100644
--- a/test/Help.py
+++ b/test/Help.py
@@ -83,3 +83,9 @@ Use scons -H for help about command-line options.
 test.run(arguments = '-h', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/IDL/IDLSUFFIXES.py b/test/IDL/IDLSUFFIXES.py
index 2aaf9fe1..f71ceba5 100644
--- a/test/IDL/IDLSUFFIXES.py
+++ b/test/IDL/IDLSUFFIXES.py
@@ -68,3 +68,9 @@ Install file: "foo.x" as "foo_x"
 test.up_to_date(arguments='.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/IDL/MIDLCOM.py b/test/IDL/MIDLCOM.py
index b2855682..9005d6b9 100644
--- a/test/IDL/MIDLCOM.py
+++ b/test/IDL/MIDLCOM.py
@@ -71,3 +71,9 @@ test.up_to_date(options = '--debug=explain', arguments = 'aaa.tlb')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/IDL/MIDLCOMSTR.py b/test/IDL/MIDLCOMSTR.py
index 8c3a15a7..472526ad 100644
--- a/test/IDL/MIDLCOMSTR.py
+++ b/test/IDL/MIDLCOMSTR.py
@@ -65,3 +65,9 @@ test.must_match('aaa.tlb', "aaa.idl\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/IDL/midl.py b/test/IDL/midl.py
index ac9597cd..bf4f58cf 100644
--- a/test/IDL/midl.py
+++ b/test/IDL/midl.py
@@ -442,3 +442,9 @@ test.must_not_exist(['build2','bar.lib'])
 test.must_not_exist(['build2','bar.exp'])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Ignore.py b/test/Ignore.py
index 15cf4f3c..0716e11f 100644
--- a/test/Ignore.py
+++ b/test/Ignore.py
@@ -113,3 +113,9 @@ env.Ignore(file1, [[file2, 'file3']])
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/Clone.py b/test/Install/Clone.py
index 65770d25..da66157a 100644
--- a/test/Install/Clone.py
+++ b/test/Install/Clone.py
@@ -67,3 +67,9 @@ test.must_match(['sub2', 'foo.out'], "foo.in\n")
 test.must_match(['sub3', 'foo.out'], "foo.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/INSTALLSTR.py b/test/Install/INSTALLSTR.py
index 0b515581..0cc5fcef 100644
--- a/test/Install/INSTALLSTR.py
+++ b/test/Install/INSTALLSTR.py
@@ -50,3 +50,9 @@ INSTALL file => %s!
 test.must_match(['install', 'file'], "file\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/Install.py b/test/Install/Install.py
index 8c520157..8c461a74 100644
--- a/test/Install/Install.py
+++ b/test/Install/Install.py
@@ -147,3 +147,9 @@ test.run(chdir = 'work',
 f.close()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/InstallAs.py b/test/Install/InstallAs.py
index ba832597..fe860b00 100644
--- a/test/Install/InstallAs.py
+++ b/test/Install/InstallAs.py
@@ -84,3 +84,9 @@ test.up_to_date(arguments = '.')
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/directories.py b/test/Install/directories.py
index 5a795afc..74a7ac59 100644
--- a/test/Install/directories.py
+++ b/test/Install/directories.py
@@ -91,3 +91,9 @@ test.must_match(test.workpath('outside', 'd4', 'f8'),           "work/dir4/f8\n"
 test.must_match(test.workpath('outside', 'd4', 'sub', 'f9'),    "work/dir4/sub/f9\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/multi.py b/test/Install/multi.py
index e033b530..a7a6eb81 100644
--- a/test/Install/multi.py
+++ b/test/Install/multi.py
@@ -46,3 +46,9 @@ test.run(arguments = '.')
 test.must_match(['install', 'file1'], "file1\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/no-top-relative.py b/test/Install/no-top-relative.py
index 51538eac..3eb24f77 100644
--- a/test/Install/no-top-relative.py
+++ b/test/Install/no-top-relative.py
@@ -51,3 +51,9 @@ test.run()
 test.must_match(['install', '#testfile.txt#'], "test/#testfile.txt#\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/option--install-sandbox.py b/test/Install/option--install-sandbox.py
index 32e61a18..020cd3ac 100644
--- a/test/Install/option--install-sandbox.py
+++ b/test/Install/option--install-sandbox.py
@@ -74,3 +74,9 @@ test.must_match('destination/subdir/file3.out', "subdir/file3.in\n")
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/tool.py b/test/Install/tool.py
index 4f09b73e..1e49584b 100644
--- a/test/Install/tool.py
+++ b/test/Install/tool.py
@@ -49,3 +49,9 @@ test.must_match(['iii', 'foo.in'], "foo.in\n")
 test.must_match('foo.out', "foo.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Install/wrap-by-attribute.py b/test/Install/wrap-by-attribute.py
index cdfe41ca..e36d11db 100644
--- a/test/Install/wrap-by-attribute.py
+++ b/test/Install/wrap-by-attribute.py
@@ -107,3 +107,9 @@ test.must_match(f4_new_out,     "f4.in\n")
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Intel/icpc-link.py b/test/Intel/icpc-link.py
index 068e0f38..58d6efd1 100644
--- a/test/Intel/icpc-link.py
+++ b/test/Intel/icpc-link.py
@@ -57,3 +57,9 @@ main()
 test.run(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/Alias.py b/test/Interactive/Alias.py
index fc05b9ab..ab4c64c9 100644
--- a/test/Interactive/Alias.py
+++ b/test/Interactive/Alias.py
@@ -83,3 +83,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/Default-None.py b/test/Interactive/Default-None.py
index 36ebf2fb..3f4db829 100644
--- a/test/Interactive/Default-None.py
+++ b/test/Interactive/Default-None.py
@@ -94,3 +94,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/Default.py b/test/Interactive/Default.py
index d6205e29..94295682 100644
--- a/test/Interactive/Default.py
+++ b/test/Interactive/Default.py
@@ -84,3 +84,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/added-include.py b/test/Interactive/added-include.py
index ca7c92f5..86a473de 100644
--- a/test/Interactive/added-include.py
+++ b/test/Interactive/added-include.py
@@ -113,3 +113,9 @@ test.run(program = foo_exe, stdout = 'foo.h.in 3\n')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/basic.py b/test/Interactive/basic.py
index 4c78f69c..31a7be7d 100644
--- a/test/Interactive/basic.py
+++ b/test/Interactive/basic.py
@@ -82,3 +82,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/cache-debug.py b/test/Interactive/cache-debug.py
index dab51596..68bedb82 100644
--- a/test/Interactive/cache-debug.py
+++ b/test/Interactive/cache-debug.py
@@ -115,3 +115,9 @@ test.finish(scons, stdout = expect_stdout, match=TestCmd.match_re)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/cache-disable.py b/test/Interactive/cache-disable.py
index 0fb8435c..ef986db4 100644
--- a/test/Interactive/cache-disable.py
+++ b/test/Interactive/cache-disable.py
@@ -113,3 +113,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/cache-force.py b/test/Interactive/cache-force.py
index 8fd3f920..2fb74941 100644
--- a/test/Interactive/cache-force.py
+++ b/test/Interactive/cache-force.py
@@ -111,3 +111,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/cache-show.py b/test/Interactive/cache-show.py
index c1fe4873..e3fe96c3 100644
--- a/test/Interactive/cache-show.py
+++ b/test/Interactive/cache-show.py
@@ -113,3 +113,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/clean.py b/test/Interactive/clean.py
index 4f4f80de..b2a7bb70 100644
--- a/test/Interactive/clean.py
+++ b/test/Interactive/clean.py
@@ -103,3 +103,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/exit.py b/test/Interactive/exit.py
index df06d5da..90584990 100644
--- a/test/Interactive/exit.py
+++ b/test/Interactive/exit.py
@@ -62,3 +62,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/failure.py b/test/Interactive/failure.py
index 75f460fa..122d875c 100644
--- a/test/Interactive/failure.py
+++ b/test/Interactive/failure.py
@@ -149,3 +149,9 @@ test.finish(scons, stdout = expect_stdout, stderr = expect_stderr)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/help.py b/test/Interactive/help.py
index ef4c5783..6020bdec 100644
--- a/test/Interactive/help.py
+++ b/test/Interactive/help.py
@@ -83,3 +83,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/implicit-VariantDir.py b/test/Interactive/implicit-VariantDir.py
index b69264b7..8975e900 100644
--- a/test/Interactive/implicit-VariantDir.py
+++ b/test/Interactive/implicit-VariantDir.py
@@ -140,3 +140,9 @@ test.finish(scons)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/option--Q.py b/test/Interactive/option--Q.py
index 4c02fa72..19b70c1c 100644
--- a/test/Interactive/option--Q.py
+++ b/test/Interactive/option--Q.py
@@ -81,3 +81,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/option-i.py b/test/Interactive/option-i.py
index a2935a70..2ea1f04b 100644
--- a/test/Interactive/option-i.py
+++ b/test/Interactive/option-i.py
@@ -104,3 +104,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/option-j.py b/test/Interactive/option-j.py
index 29bba88b..279fc51c 100644
--- a/test/Interactive/option-j.py
+++ b/test/Interactive/option-j.py
@@ -162,3 +162,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/option-k.py b/test/Interactive/option-k.py
index f15605e9..2a325181 100644
--- a/test/Interactive/option-k.py
+++ b/test/Interactive/option-k.py
@@ -106,3 +106,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/option-n.py b/test/Interactive/option-n.py
index f5ee1e3e..2bdaa340 100644
--- a/test/Interactive/option-n.py
+++ b/test/Interactive/option-n.py
@@ -77,3 +77,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/option-s.py b/test/Interactive/option-s.py
index 167d581f..59b79cea 100644
--- a/test/Interactive/option-s.py
+++ b/test/Interactive/option-s.py
@@ -77,3 +77,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/repeat-line.py b/test/Interactive/repeat-line.py
index e85b9ea6..7fb776e5 100644
--- a/test/Interactive/repeat-line.py
+++ b/test/Interactive/repeat-line.py
@@ -85,3 +85,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/shell.py b/test/Interactive/shell.py
index 5b35f87e..4e4907a0 100644
--- a/test/Interactive/shell.py
+++ b/test/Interactive/shell.py
@@ -114,3 +114,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/taskmastertrace.py b/test/Interactive/taskmastertrace.py
index 4ccf46bb..48089e35 100644
--- a/test/Interactive/taskmastertrace.py
+++ b/test/Interactive/taskmastertrace.py
@@ -111,3 +111,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/tree.py b/test/Interactive/tree.py
index fcf35c6e..61faa229 100644
--- a/test/Interactive/tree.py
+++ b/test/Interactive/tree.py
@@ -87,3 +87,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/unknown-command.py b/test/Interactive/unknown-command.py
index 2b773780..1063cc04 100644
--- a/test/Interactive/unknown-command.py
+++ b/test/Interactive/unknown-command.py
@@ -64,3 +64,9 @@ test.finish(scons, stdout = expect_stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/variant_dir.py b/test/Interactive/variant_dir.py
index 68ee2a32..f36bd0a4 100644
--- a/test/Interactive/variant_dir.py
+++ b/test/Interactive/variant_dir.py
@@ -111,3 +111,9 @@ test.finish(scons)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Interactive/version.py b/test/Interactive/version.py
index 37163a31..f948db7a 100644
--- a/test/Interactive/version.py
+++ b/test/Interactive/version.py
@@ -80,3 +80,9 @@ if not test.match_re(stdout, expect1) and not test.match_re(stdout, expect2):
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAR.py b/test/Java/JAR.py
index 34657ff7..ca12ae4c 100644
--- a/test/Java/JAR.py
+++ b/test/Java/JAR.py
@@ -248,3 +248,9 @@ test.must_exist('bar.jar')
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JARCHDIR.py b/test/Java/JARCHDIR.py
index a3f2ec4f..e3f22db8 100644
--- a/test/Java/JARCHDIR.py
+++ b/test/Java/JARCHDIR.py
@@ -115,3 +115,9 @@ test.run(arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JARCOM.py b/test/Java/JARCOM.py
index f03cd9f7..a51ea5a6 100644
--- a/test/Java/JARCOM.py
+++ b/test/Java/JARCOM.py
@@ -63,3 +63,9 @@ test.must_match('test1.jar', "file1.in\nfile2.in\nfile3.in\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JARCOMSTR.py b/test/Java/JARCOMSTR.py
index 35404ce2..4358f6b5 100644
--- a/test/Java/JARCOMSTR.py
+++ b/test/Java/JARCOMSTR.py
@@ -67,3 +67,9 @@ test.must_match('test1.jar', "file1.in\nfile2.in\nfile3.in\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JARFLAGS.py b/test/Java/JARFLAGS.py
index 03a222b8..73064267 100644
--- a/test/Java/JARFLAGS.py
+++ b/test/Java/JARFLAGS.py
@@ -78,3 +78,9 @@ test.run(arguments = '.',
 test.must_exist('test.jar')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVABOOTCLASSPATH.py b/test/Java/JAVABOOTCLASSPATH.py
index 5962b945..e448165a 100644
--- a/test/Java/JAVABOOTCLASSPATH.py
+++ b/test/Java/JAVABOOTCLASSPATH.py
@@ -93,3 +93,9 @@ expect = """\
 test.run(arguments = '-Q -n .', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVAC.py b/test/Java/JAVAC.py
index baedac0f..bb823fce 100644
--- a/test/Java/JAVAC.py
+++ b/test/Java/JAVAC.py
@@ -97,3 +97,9 @@ line 3
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVACCOM.py b/test/Java/JAVACCOM.py
index b6a30e93..c4eaa928 100644
--- a/test/Java/JAVACCOM.py
+++ b/test/Java/JAVACCOM.py
@@ -66,3 +66,9 @@ test.must_match(['classes', 'file1.class'],
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVACCOMSTR.py b/test/Java/JAVACCOMSTR.py
index 88fa31da..23e7dfbd 100644
--- a/test/Java/JAVACCOMSTR.py
+++ b/test/Java/JAVACCOMSTR.py
@@ -77,3 +77,9 @@ test.must_match(['classes', 'file1.class'],
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVACFLAGS.py b/test/Java/JAVACFLAGS.py
index e2870549..d86c267c 100644
--- a/test/Java/JAVACFLAGS.py
+++ b/test/Java/JAVACFLAGS.py
@@ -64,3 +64,9 @@ test.run(arguments = '.',
 test.must_exist(['classes', 'src', 'Example1.class'])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVACLASSPATH.py b/test/Java/JAVACLASSPATH.py
index 11f7c2c4..bc3bb212 100644
--- a/test/Java/JAVACLASSPATH.py
+++ b/test/Java/JAVACLASSPATH.py
@@ -89,3 +89,9 @@ test.must_exist(['outdir', 'com_Example2.h'])
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVAH.py b/test/Java/JAVAH.py
index 32ad1195..2518928b 100644
--- a/test/Java/JAVAH.py
+++ b/test/Java/JAVAH.py
@@ -299,3 +299,9 @@ test.must_exist(['outdir2', 'com_sub_bar_Example6.h'])
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVAHCOM.py b/test/Java/JAVAHCOM.py
index 73067c61..10303801 100644
--- a/test/Java/JAVAHCOM.py
+++ b/test/Java/JAVAHCOM.py
@@ -67,3 +67,9 @@ test.must_match(['out', 'file3.h'], "file3.class\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVAHCOMSTR.py b/test/Java/JAVAHCOMSTR.py
index 8ee57670..f3185240 100644
--- a/test/Java/JAVAHCOMSTR.py
+++ b/test/Java/JAVAHCOMSTR.py
@@ -83,3 +83,9 @@ test.must_match(['out', 'file3.h'], "file3.class\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/JAVASOURCEPATH.py b/test/Java/JAVASOURCEPATH.py
index 87e90add..5f19004b 100644
--- a/test/Java/JAVASOURCEPATH.py
+++ b/test/Java/JAVASOURCEPATH.py
@@ -72,3 +72,9 @@ test.must_exist(['bar', 'classes', 'com', 'foo', 'test', 'TestFoo.class'])
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/Java-1.4.py b/test/Java/Java-1.4.py
index 0906513d..f0f5a93f 100644
--- a/test/Java/Java-1.4.py
+++ b/test/Java/Java-1.4.py
@@ -396,3 +396,9 @@ classes_must_not_exist('class5', expect_5)
 test.fail_test(failed)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/Java-1.5.py b/test/Java/Java-1.5.py
index 20ebc250..e769c222 100644
--- a/test/Java/Java-1.5.py
+++ b/test/Java/Java-1.5.py
@@ -392,3 +392,9 @@ classes_must_not_exist('class5', expect_5)
 test.fail_test(failed)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/Java-1.6.py b/test/Java/Java-1.6.py
index 649cf010..d107e321 100644
--- a/test/Java/Java-1.6.py
+++ b/test/Java/Java-1.6.py
@@ -392,3 +392,9 @@ classes_must_not_exist('class5', expect_5)
 test.fail_test(failed)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/RMIC.py b/test/Java/RMIC.py
index 3340707a..0abf5a4e 100644
--- a/test/Java/RMIC.py
+++ b/test/Java/RMIC.py
@@ -325,3 +325,9 @@ test.must_exist(test.workpath('outdir2', 'com', 'sub', 'bar', 'Example4_Stub.cla
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/RMICCOM.py b/test/Java/RMICCOM.py
index e8a56553..6bc50da4 100644
--- a/test/Java/RMICCOM.py
+++ b/test/Java/RMICCOM.py
@@ -77,3 +77,9 @@ test.must_match(out_file3, "file3.class\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/RMICCOMSTR.py b/test/Java/RMICCOMSTR.py
index a92bac53..8981ed7e 100644
--- a/test/Java/RMICCOMSTR.py
+++ b/test/Java/RMICCOMSTR.py
@@ -83,3 +83,9 @@ test.must_match(out_file3, "file3.class\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/multi-step.py b/test/Java/multi-step.py
index 34e814b3..19b81674 100644
--- a/test/Java/multi-step.py
+++ b/test/Java/multi-step.py
@@ -570,3 +570,9 @@ if not os.path.exists(p):
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/nested-classes.py b/test/Java/nested-classes.py
index 3550e768..7772c572 100644
--- a/test/Java/nested-classes.py
+++ b/test/Java/nested-classes.py
@@ -99,3 +99,9 @@ public class Test {
 """)
 
 test.run(arguments = '.')
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/no-JARCHDIR.py b/test/Java/no-JARCHDIR.py
index d0233f6a..20375249 100644
--- a/test/Java/no-JARCHDIR.py
+++ b/test/Java/no-JARCHDIR.py
@@ -106,3 +106,9 @@ test.must_contain_all_lines(test.stdout(), [expect])
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/source-files.py b/test/Java/source-files.py
index 63d1d92a..bf263cf3 100644
--- a/test/Java/source-files.py
+++ b/test/Java/source-files.py
@@ -118,3 +118,9 @@ test.must_not_exist(['class2', 'com', 'Example4.class'])
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/swig-dependencies.py b/test/Java/swig-dependencies.py
index f71ab31e..2c53f0c4 100644
--- a/test/Java/swig-dependencies.py
+++ b/test/Java/swig-dependencies.py
@@ -133,3 +133,9 @@ test.must_exist(['java', 'classes', 'foopackJNI.class'])
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/KeyboardInterrupt.py b/test/KeyboardInterrupt.py
index f19c2c0e..d0f12076 100644
--- a/test/KeyboardInterrupt.py
+++ b/test/KeyboardInterrupt.py
@@ -116,3 +116,9 @@ for i in range(2):
     runtest('-j64 --random')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LEX/LEX.py b/test/LEX/LEX.py
index 94692dbb..7964063b 100644
--- a/test/LEX/LEX.py
+++ b/test/LEX/LEX.py
@@ -72,3 +72,9 @@ test.must_match('ddd.m',    "ddd.lm\nmylex.py\n",       mode='r')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LEX/LEXCOM.py b/test/LEX/LEXCOM.py
index 7ce8a15c..f496f951 100644
--- a/test/LEX/LEXCOM.py
+++ b/test/LEX/LEXCOM.py
@@ -64,3 +64,9 @@ test.must_match('bbb.c', "bbb.lex\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LEX/LEXCOMSTR.py b/test/LEX/LEXCOMSTR.py
index a06c20c2..fa0bbf19 100644
--- a/test/LEX/LEXCOMSTR.py
+++ b/test/LEX/LEXCOMSTR.py
@@ -69,3 +69,9 @@ test.must_match('bbb.c', "bbb.lex\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LEX/LEXFLAGS.py b/test/LEX/LEXFLAGS.py
index 1555142c..7d7aff17 100644
--- a/test/LEX/LEXFLAGS.py
+++ b/test/LEX/LEXFLAGS.py
@@ -74,3 +74,9 @@ test.must_match(['out', 'aaa.c'],	"aaa.l\n -x -t\n out in\n", mode='r')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LEX/live.py b/test/LEX/live.py
index e917039a..da511753 100644
--- a/test/LEX/live.py
+++ b/test/LEX/live.py
@@ -101,3 +101,9 @@ test.run(program = test.workpath('bar'), stdin = "b\n", stdout = "Bbar.lB\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/LINK.py b/test/LINK/LINK.py
index ede03f5c..851ddc9d 100644
--- a/test/LINK/LINK.py
+++ b/test/LINK/LINK.py
@@ -84,3 +84,9 @@ test.run(arguments = 'bar' + _exe)
 test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/LINKCOM.py b/test/LINK/LINKCOM.py
index db8a2215..b3c56d64 100644
--- a/test/LINK/LINKCOM.py
+++ b/test/LINK/LINKCOM.py
@@ -71,3 +71,9 @@ test.must_match('test1.exe', "test1.obj\ntest2.obj\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/LINKCOMSTR.py b/test/LINK/LINKCOMSTR.py
index 9eb40271..045574cd 100644
--- a/test/LINK/LINKCOMSTR.py
+++ b/test/LINK/LINKCOMSTR.py
@@ -77,3 +77,9 @@ test.must_match('test1.exe', "test1.obj\ntest2.obj\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/LINKFLAGS.py b/test/LINK/LINKFLAGS.py
index d80960d1..78385f1b 100644
--- a/test/LINK/LINKFLAGS.py
+++ b/test/LINK/LINKFLAGS.py
@@ -85,3 +85,9 @@ test.run(arguments = 'bar' + _exe)
 test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/SHLINK.py b/test/LINK/SHLINK.py
index 296845c2..c9be8bf8 100644
--- a/test/LINK/SHLINK.py
+++ b/test/LINK/SHLINK.py
@@ -82,3 +82,9 @@ test.run(arguments = dll_ + 'bar' + _shlib)
 test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/SHLINKCOM.py b/test/LINK/SHLINKCOM.py
index 667564e4..23b049c2 100644
--- a/test/LINK/SHLINKCOM.py
+++ b/test/LINK/SHLINKCOM.py
@@ -88,3 +88,9 @@ test.must_match('test3.dll', "test1.c\ntest2.c\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/SHLINKCOMSTR.py b/test/LINK/SHLINKCOMSTR.py
index a3dc2cf3..1d93b75f 100644
--- a/test/LINK/SHLINKCOMSTR.py
+++ b/test/LINK/SHLINKCOMSTR.py
@@ -94,3 +94,9 @@ test.must_match('test3.dll', "test1.c\ntest2.c\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LINK/SHLINKFLAGS.py b/test/LINK/SHLINKFLAGS.py
index 51a8f7c9..924fafd7 100644
--- a/test/LINK/SHLINKFLAGS.py
+++ b/test/LINK/SHLINKFLAGS.py
@@ -84,3 +84,8 @@ test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
 
 test.pass_test()
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/LIBPATH.py b/test/Libs/LIBPATH.py
index e52cb9fa..b5a1b54b 100644
--- a/test/Libs/LIBPATH.py
+++ b/test/Libs/LIBPATH.py
@@ -173,3 +173,9 @@ test.run(arguments = '.',
          match=TestSCons.match_re_dotall)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/LIBPREFIX.py b/test/Libs/LIBPREFIX.py
index a71e9673..764fb4e5 100644
--- a/test/Libs/LIBPREFIX.py
+++ b/test/Libs/LIBPREFIX.py
@@ -36,3 +36,9 @@ test.write('SConstruct', """
 test.run(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/LIBPREFIXES.py b/test/Libs/LIBPREFIXES.py
index 1e5d6c2b..1b284588 100644
--- a/test/Libs/LIBPREFIXES.py
+++ b/test/Libs/LIBPREFIXES.py
@@ -75,3 +75,9 @@ test.fail_test(not os.path.exists(test.workpath('xxx-foo' + _lib)))
 test.run(program = test.workpath('prog'), stdout = "foo.c\nprog.c\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/LIBS.py b/test/Libs/LIBS.py
index e9f65451..fa6295a5 100644
--- a/test/Libs/LIBS.py
+++ b/test/Libs/LIBS.py
@@ -287,3 +287,9 @@ test.run(program=blender_exe,
          stdout='src/component1/message.c\nsrc/component2/hello.c\n')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/LIBSUFFIX.py b/test/Libs/LIBSUFFIX.py
index a71e9673..764fb4e5 100644
--- a/test/Libs/LIBSUFFIX.py
+++ b/test/Libs/LIBSUFFIX.py
@@ -36,3 +36,9 @@ test.write('SConstruct', """
 test.run(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/LIBSUFFIXES.py b/test/Libs/LIBSUFFIXES.py
index 29cbb18e..4426e603 100644
--- a/test/Libs/LIBSUFFIXES.py
+++ b/test/Libs/LIBSUFFIXES.py
@@ -75,3 +75,9 @@ test.fail_test(not os.path.exists(test.workpath(lib_ + 'foo.xxx')))
 test.run(program = test.workpath('prog'), stdout = "foo.c\nprog.c\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/Library.py b/test/Libs/Library.py
index 4bcb2c7d..b603926a 100644
--- a/test/Libs/Library.py
+++ b/test/Libs/Library.py
@@ -165,3 +165,9 @@ test.run(program = test.workpath('uses-nrd'),
          stdout = "nrd\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/SHLIBPREFIX.py b/test/Libs/SHLIBPREFIX.py
index 2af6a96c..c46b5aac 100644
--- a/test/Libs/SHLIBPREFIX.py
+++ b/test/Libs/SHLIBPREFIX.py
@@ -51,3 +51,9 @@ test.run(arguments = '.')
 test.fail_test(not os.path.exists(test.workpath('shlib-foo' + _lib)))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/SHLIBSUFFIX.py b/test/Libs/SHLIBSUFFIX.py
index e2509fab..31fe8ba8 100644
--- a/test/Libs/SHLIBSUFFIX.py
+++ b/test/Libs/SHLIBSUFFIX.py
@@ -51,3 +51,9 @@ test.run(arguments = '.')
 test.fail_test(not os.path.exists(test.workpath(dll_ + 'foo.shlib')))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/SharedLibrary.py b/test/Libs/SharedLibrary.py
index b688a0bd..1bb91ead 100644
--- a/test/Libs/SharedLibrary.py
+++ b/test/Libs/SharedLibrary.py
@@ -282,3 +282,9 @@ main(int argc, char *argv[])
              stdout = "f4.c\nprogbar.c\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Libs/SharedLibraryIxes.py b/test/Libs/SharedLibraryIxes.py
index f9d14711..fb0bc22e 100644
--- a/test/Libs/SharedLibraryIxes.py
+++ b/test/Libs/SharedLibraryIxes.py
@@ -259,3 +259,9 @@ for t in tests:
     test.run(program = test.workpath(t[3]), stdout=expected)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/LoadableModule.py b/test/LoadableModule.py
index 1c4ae310..4c69dc00 100644
--- a/test/LoadableModule.py
+++ b/test/LoadableModule.py
@@ -117,3 +117,9 @@ if sys.platform in platforms_with_dlopen:
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/M4/M4.py b/test/M4/M4.py
index d7d87bd5..9f877ee5 100644
--- a/test/M4/M4.py
+++ b/test/M4/M4.py
@@ -103,3 +103,9 @@ bar.M4(target = 'bar', source = 'bar.m4')
     test.fail_test(test.read('bar', 'r') != "line 1\nbbb\nline 3\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/M4/M4COM.py b/test/M4/M4COM.py
index 8c36d867..92996457 100644
--- a/test/M4/M4COM.py
+++ b/test/M4/M4COM.py
@@ -61,3 +61,9 @@ test.must_match('aaa.out', "aaa.in\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/M4/M4COMSTR.py b/test/M4/M4COMSTR.py
index a9e91e68..1425f5cb 100644
--- a/test/M4/M4COMSTR.py
+++ b/test/M4/M4COMSTR.py
@@ -65,3 +65,9 @@ test.must_match('aaa.out', "aaa.in\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/PCHCOM.py b/test/MSVC/PCHCOM.py
index 24733915..308dd0ea 100644
--- a/test/MSVC/PCHCOM.py
+++ b/test/MSVC/PCHCOM.py
@@ -61,3 +61,9 @@ test.must_match('aaa.pch', "aaa.h\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/PCHCOMSTR.py b/test/MSVC/PCHCOMSTR.py
index 23322d4a..a3ee99e1 100644
--- a/test/MSVC/PCHCOMSTR.py
+++ b/test/MSVC/PCHCOMSTR.py
@@ -65,3 +65,9 @@ test.must_match('aaa.pch', "aaa.h\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/PCHSTOP-errors.py b/test/MSVC/PCHSTOP-errors.py
index 8c5bb140..6ffd11ae 100644
--- a/test/MSVC/PCHSTOP-errors.py
+++ b/test/MSVC/PCHSTOP-errors.py
@@ -73,3 +73,9 @@ test.run(arguments='SET_PCHSTOP=1', status=2, stderr=expect_stderr)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/RCCOM.py b/test/MSVC/RCCOM.py
index e881bb58..babc4c7d 100644
--- a/test/MSVC/RCCOM.py
+++ b/test/MSVC/RCCOM.py
@@ -62,3 +62,9 @@ test.must_match('aaa.res', "aaa.rc\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/RCCOMSTR.py b/test/MSVC/RCCOMSTR.py
index 96ccee09..b346f489 100644
--- a/test/MSVC/RCCOMSTR.py
+++ b/test/MSVC/RCCOMSTR.py
@@ -65,3 +65,9 @@ test.must_match('aaa.res', "aaa.rc\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/batch.py b/test/MSVC/batch.py
index 3776df7e..bc65f829 100644
--- a/test/MSVC/batch.py
+++ b/test/MSVC/batch.py
@@ -153,3 +153,9 @@ test.must_match('fake_cl.log', """\
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/generate-rc.py b/test/MSVC/generate-rc.py
index 0b3c3320..40ef95e0 100644
--- a/test/MSVC/generate-rc.py
+++ b/test/MSVC/generate-rc.py
@@ -68,3 +68,9 @@ test.must_match('my.rc', "generate_rc\nmy.in\n")
 test.must_match('my.res', "fake_rc.py\ngenerate_rc\nmy.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/hierarchical.py b/test/MSVC/hierarchical.py
index 19b9dcc2..cfc61cd3 100644
--- a/test/MSVC/hierarchical.py
+++ b/test/MSVC/hierarchical.py
@@ -91,3 +91,9 @@ test.must_not_exist(test.workpath('build/StdAfx.obj'))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/msvc.py b/test/MSVC/msvc.py
index fe464c4c..4ad562c5 100644
--- a/test/MSVC/msvc.py
+++ b/test/MSVC/msvc.py
@@ -192,3 +192,9 @@ test.run(program=test.workpath('test.exe'), stdout='2003 test 2\n')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/multiple-pdb.py b/test/MSVC/multiple-pdb.py
index feb3fd97..053fd5a1 100644
--- a/test/MSVC/multiple-pdb.py
+++ b/test/MSVC/multiple-pdb.py
@@ -81,3 +81,9 @@ test.must_exist('test2%s' % _exe)
 test.must_exist('test2.pdb')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/pdb-VariantDir-path.py b/test/MSVC/pdb-VariantDir-path.py
index 028b2de0..1ecb9a32 100644
--- a/test/MSVC/pdb-VariantDir-path.py
+++ b/test/MSVC/pdb-VariantDir-path.py
@@ -74,3 +74,9 @@ test.must_exist(['.build', 'test%s'     % _exe])
 test.must_exist(['.build', 'test%s.pdb' % _exe])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVC/pdb-manifest.py b/test/MSVC/pdb-manifest.py
index 00f3ee27..d70989f0 100644
--- a/test/MSVC/pdb-manifest.py
+++ b/test/MSVC/pdb-manifest.py
@@ -79,3 +79,9 @@ test.must_exist('staticlib%s' % _lib)
 test.must_not_exist('staticlib.pdb')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/common-prefix.py b/test/MSVS/common-prefix.py
index 66a8a8b8..debe992e 100644
--- a/test/MSVS/common-prefix.py
+++ b/test/MSVS/common-prefix.py
@@ -178,3 +178,9 @@ assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/runfile.py b/test/MSVS/runfile.py
index 3edd711e..7c85a168 100644
--- a/test/MSVS/runfile.py
+++ b/test/MSVS/runfile.py
@@ -126,3 +126,9 @@ assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-6.0-clean.py b/test/MSVS/vs-6.0-clean.py
index 90655f45..c97bfc64 100644
--- a/test/MSVS/vs-6.0-clean.py
+++ b/test/MSVS/vs-6.0-clean.py
@@ -103,3 +103,9 @@ test.must_not_exist(test.workpath('Test.dsp'))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-6.0-exec.py b/test/MSVS/vs-6.0-exec.py
index 2b76db46..36ce30c0 100644
--- a/test/MSVS/vs-6.0-exec.py
+++ b/test/MSVS/vs-6.0-exec.py
@@ -92,3 +92,9 @@ test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-6.0-files.py b/test/MSVS/vs-6.0-files.py
index 3e75626e..945d6eb2 100644
--- a/test/MSVS/vs-6.0-files.py
+++ b/test/MSVS/vs-6.0-files.py
@@ -77,3 +77,9 @@ test.must_not_exist(test.workpath('Test.dsw'))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-6.0-variant_dir.py b/test/MSVS/vs-6.0-variant_dir.py
index c642e4e2..d248e6f7 100644
--- a/test/MSVS/vs-6.0-variant_dir.py
+++ b/test/MSVS/vs-6.0-variant_dir.py
@@ -80,3 +80,9 @@ The real workspace file is here:
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.0-clean.py b/test/MSVS/vs-7.0-clean.py
index bf443397..8487ea98 100644
--- a/test/MSVS/vs-7.0-clean.py
+++ b/test/MSVS/vs-7.0-clean.py
@@ -104,3 +104,9 @@ test.must_not_exist(test.workpath('Test.vcproj'))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.0-exec.py b/test/MSVS/vs-7.0-exec.py
index 5ffb35c1..29647bb0 100644
--- a/test/MSVS/vs-7.0-exec.py
+++ b/test/MSVS/vs-7.0-exec.py
@@ -94,3 +94,9 @@ test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.0-files.py b/test/MSVS/vs-7.0-files.py
index d20b298b..46fe4dbd 100644
--- a/test/MSVS/vs-7.0-files.py
+++ b/test/MSVS/vs-7.0-files.py
@@ -96,3 +96,9 @@ assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.0-variant_dir.py b/test/MSVS/vs-7.0-variant_dir.py
index eba00dc5..cd41f01d 100644
--- a/test/MSVS/vs-7.0-variant_dir.py
+++ b/test/MSVS/vs-7.0-variant_dir.py
@@ -82,3 +82,9 @@ The real workspace file is here:
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.1-clean.py b/test/MSVS/vs-7.1-clean.py
index 2e8bb997..1a3f3f40 100644
--- a/test/MSVS/vs-7.1-clean.py
+++ b/test/MSVS/vs-7.1-clean.py
@@ -104,3 +104,9 @@ test.must_not_exist(test.workpath('Test.vcproj'))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.1-exec.py b/test/MSVS/vs-7.1-exec.py
index 0f99def4..5dd2a176 100644
--- a/test/MSVS/vs-7.1-exec.py
+++ b/test/MSVS/vs-7.1-exec.py
@@ -94,3 +94,9 @@ test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.1-files.py b/test/MSVS/vs-7.1-files.py
index 35815db3..70ee19a9 100644
--- a/test/MSVS/vs-7.1-files.py
+++ b/test/MSVS/vs-7.1-files.py
@@ -96,3 +96,9 @@ assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-7.1-variant_dir.py b/test/MSVS/vs-7.1-variant_dir.py
index f0b6ffb9..d506c9fe 100644
--- a/test/MSVS/vs-7.1-variant_dir.py
+++ b/test/MSVS/vs-7.1-variant_dir.py
@@ -82,3 +82,9 @@ The real workspace file is here:
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-8.0-clean.py b/test/MSVS/vs-8.0-clean.py
index 4c023d0a..d8a1d6f2 100644
--- a/test/MSVS/vs-8.0-clean.py
+++ b/test/MSVS/vs-8.0-clean.py
@@ -104,3 +104,9 @@ test.must_not_exist(test.workpath('Test.vcproj'))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-8.0-exec.py b/test/MSVS/vs-8.0-exec.py
index b43b2d4d..ad61a5e5 100644
--- a/test/MSVS/vs-8.0-exec.py
+++ b/test/MSVS/vs-8.0-exec.py
@@ -98,3 +98,9 @@ test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-8.0-files.py b/test/MSVS/vs-8.0-files.py
index 28e9f2a5..86dcfd25 100644
--- a/test/MSVS/vs-8.0-files.py
+++ b/test/MSVS/vs-8.0-files.py
@@ -96,3 +96,9 @@ assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MSVS/vs-8.0-variant_dir.py b/test/MSVS/vs-8.0-variant_dir.py
index 6176981d..22509cb5 100644
--- a/test/MSVS/vs-8.0-variant_dir.py
+++ b/test/MSVS/vs-8.0-variant_dir.py
@@ -86,3 +86,9 @@ The real workspace file is here:
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MinGW/RCCOM.py b/test/MinGW/RCCOM.py
index a272af74..45683ddc 100644
--- a/test/MinGW/RCCOM.py
+++ b/test/MinGW/RCCOM.py
@@ -64,3 +64,9 @@ test.must_match('aaa.o', "aaa.rc\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/MinGW/RCCOMSTR.py b/test/MinGW/RCCOMSTR.py
index d04c5d6f..67957959 100644
--- a/test/MinGW/RCCOMSTR.py
+++ b/test/MinGW/RCCOMSTR.py
@@ -67,3 +67,9 @@ test.must_match('aaa.o', "aaa.rc\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Mkdir.py b/test/Mkdir.py
index 144c9a6c..f79a32af 100644
--- a/test/Mkdir.py
+++ b/test/Mkdir.py
@@ -189,3 +189,8 @@ test.run(chdir = 'work3', arguments = '')
 
 test.pass_test()
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Move.py b/test/Move.py
index ba555819..d83a5cdf 100644
--- a/test/Move.py
+++ b/test/Move.py
@@ -95,3 +95,9 @@ test.must_match('f6.out', "f6.in\n")
 test.must_match('Move-f6.out', "f6.in-Move\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/NodeOps.py b/test/NodeOps.py
index ffaeb622..96e9f12e 100644
--- a/test/NodeOps.py
+++ b/test/NodeOps.py
@@ -350,3 +350,9 @@ for name in build_nodes:
 cleanup_test()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Object.py b/test/Object.py
index 108960da..406c2c11 100644
--- a/test/Object.py
+++ b/test/Object.py
@@ -120,3 +120,9 @@ test.run(program = test.workpath('prog2'), stdout = stdout)
 test.run(program = test.workpath('prog3'), stdout = stdout)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/PRINT_CMD_LINE_FUNC.py b/test/PRINT_CMD_LINE_FUNC.py
index 0373a1e5..45a741c0 100644
--- a/test/PRINT_CMD_LINE_FUNC.py
+++ b/test/PRINT_CMD_LINE_FUNC.py
@@ -73,3 +73,9 @@ e.Program(target = 'prog', source = 'prog.c')
 test.run(arguments = '-Q .')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Parallel/duplicate-children.py b/test/Parallel/duplicate-children.py
index 26d873bb..c6c5c295 100644
--- a/test/Parallel/duplicate-children.py
+++ b/test/Parallel/duplicate-children.py
@@ -66,3 +66,9 @@ test.must_match('foo.out', "foo.in\n")
 test.must_match('foobar', "foo.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Parallel/duplicate-target.py b/test/Parallel/duplicate-target.py
index 43015fe8..a9d511ec 100644
--- a/test/Parallel/duplicate-target.py
+++ b/test/Parallel/duplicate-target.py
@@ -96,3 +96,9 @@ work/sub/f2.in
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Parallel/failed-build.py b/test/Parallel/failed-build.py
index 7056db19..e6a05899 100644
--- a/test/Parallel/failed-build.py
+++ b/test/Parallel/failed-build.py
@@ -109,3 +109,9 @@ test.must_not_exist(test.workpath('f6'))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Parallel/multiple-parents.py b/test/Parallel/multiple-parents.py
index 1b7a1a1d..69accaa2 100644
--- a/test/Parallel/multiple-parents.py
+++ b/test/Parallel/multiple-parents.py
@@ -241,3 +241,9 @@ for i in range(5):
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Parallel/ref_count.py b/test/Parallel/ref_count.py
index 93b61422..1eab1736 100644
--- a/test/Parallel/ref_count.py
+++ b/test/Parallel/ref_count.py
@@ -151,3 +151,9 @@ after.in modified
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ParseConfig.py b/test/ParseConfig.py
index 8ba166f5..6473458a 100644
--- a/test/ParseConfig.py
+++ b/test/ParseConfig.py
@@ -106,3 +106,9 @@ test.run(arguments = "-q -Q -f SConstruct2 .", stdout = good_stdout)
 test.run(arguments = "-q -Q -f SConstruct3 .", stdout = stdout3)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ParseDepends.py b/test/ParseDepends.py
index 9d7907d6..12b02e25 100644
--- a/test/ParseDepends.py
+++ b/test/ParseDepends.py
@@ -154,3 +154,9 @@ test.run(status=2, stderr=None)
 test.must_contain_all_lines(test.stderr(), ["No such file or directory"])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Perforce/P4COM.py b/test/Perforce/P4COM.py
index 11b28e37..5a907750 100644
--- a/test/Perforce/P4COM.py
+++ b/test/Perforce/P4COM.py
@@ -119,3 +119,9 @@ test.must_match(['sub', 'all'],
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Perforce/P4COMSTR.py b/test/Perforce/P4COMSTR.py
index 72f05b8a..a8675f29 100644
--- a/test/Perforce/P4COMSTR.py
+++ b/test/Perforce/P4COMSTR.py
@@ -120,3 +120,9 @@ test.must_match(['sub', 'all'],
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Perforce/Perforce.py b/test/Perforce/Perforce.py
index b409210e..ee4b0b5e 100644
--- a/test/Perforce/Perforce.py
+++ b/test/Perforce/Perforce.py
@@ -271,3 +271,9 @@ test.fail_test(test.read(['work', 'all']) != "import/aaa.in\nwork/foo/bbb.in\nim
 test.fail_test(test.read(['work', 'foo', 'sub', 'all']) != "import/sub/ddd.in\nwork/foo/sub/eee.in\nimport/sub/fff.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/PharLap.py b/test/PharLap.py
index 991ac0b9..8e56f21d 100644
--- a/test/PharLap.py
+++ b/test/PharLap.py
@@ -309,3 +309,9 @@ test.run(arguments = '.')
 test.fail_test(oldtime == os.path.getmtime(test.workpath('minasm.exe')))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Platform.py b/test/Platform.py
index b0afe2e6..23068c43 100644
--- a/test/Platform.py
+++ b/test/Platform.py
@@ -68,3 +68,8 @@ test.run(arguments = ".", stdout = expect)
 
 test.pass_test()
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Precious.py b/test/Precious.py
index 76aa2a46..8c3dd4aa 100644
--- a/test/Precious.py
+++ b/test/Precious.py
@@ -118,3 +118,9 @@ test.fail_test(not os.path.exists(test.workpath('subdir', 'f6.out')))
 test.fail_test(os.path.exists(test.workpath('subdir', 'f7.out')))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Program-j.py b/test/Program-j.py
index 62bbf3c5..9e0190f6 100644
--- a/test/Program-j.py
+++ b/test/Program-j.py
@@ -105,3 +105,9 @@ test.run(program = test.workpath('f3'), stdout = "f3.c\n")
 test.run(program = test.workpath('f4'), stdout = "f4.c\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Program.py b/test/Program.py
index a54d7c16..15fd0c34 100644
--- a/test/Program.py
+++ b/test/Program.py
@@ -368,3 +368,9 @@ test.fail_test(not (oldtime4 == os.path.getmtime(foo4)))
 test.fail_test(not (oldtime5 == os.path.getmtime(foo5)))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Progress/TARGET.py b/test/Progress/TARGET.py
index e45f8596..c2b42138 100644
--- a/test/Progress/TARGET.py
+++ b/test/Progress/TARGET.py
@@ -64,3 +64,9 @@ if os.linesep != '\n':
 test.run(arguments = '-Q .', stdout=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Progress/dots.py b/test/Progress/dots.py
index 23b3e728..e31ec562 100644
--- a/test/Progress/dots.py
+++ b/test/Progress/dots.py
@@ -58,3 +58,9 @@ expect = """\
 test.run(arguments = '-Q .', stdout=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Progress/file.py b/test/Progress/file.py
index f0116c04..6095fb0b 100644
--- a/test/Progress/file.py
+++ b/test/Progress/file.py
@@ -79,3 +79,9 @@ if os.linesep != '\n':
 test.must_match('progress.out', expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Progress/function.py b/test/Progress/function.py
index 2fcb6710..9998008f 100644
--- a/test/Progress/function.py
+++ b/test/Progress/function.py
@@ -73,3 +73,9 @@ mpf: .
 test.run(arguments = '-Q .', stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Progress/interval.py b/test/Progress/interval.py
index 767bf207..2b992388 100644
--- a/test/Progress/interval.py
+++ b/test/Progress/interval.py
@@ -66,3 +66,9 @@ stderr: .
 test.run(arguments = '-Q .', stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Progress/object.py b/test/Progress/object.py
index 4dad1a10..25c53cf8 100644
--- a/test/Progress/object.py
+++ b/test/Progress/object.py
@@ -76,3 +76,9 @@ expect_stderr = """\
 test.run(arguments = '-Q .', stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Progress/spinner.py b/test/Progress/spinner.py
index c600b675..0919b445 100644
--- a/test/Progress/spinner.py
+++ b/test/Progress/spinner.py
@@ -64,3 +64,9 @@ if os.linesep != '\n':
 test.run(arguments = '-Q .', stdout=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/CPPPATH-appended.py b/test/QT/CPPPATH-appended.py
index dc5e8139..27809216 100644
--- a/test/QT/CPPPATH-appended.py
+++ b/test/QT/CPPPATH-appended.py
@@ -73,3 +73,9 @@ test.write(['sub', 'local_include', 'local_include.h'], r"""
 test.run(arguments = aaa_exe)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/CPPPATH.py b/test/QT/CPPPATH.py
index a45465fc..4ea42bd0 100644
--- a/test/QT/CPPPATH.py
+++ b/test/QT/CPPPATH.py
@@ -63,3 +63,9 @@ test.write(['local_include', 'local_include.h'], r"""
 test.run(arguments = aaa_exe)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/QTFLAGS.py b/test/QT/QTFLAGS.py
index 5656b086..87dcaf02 100644
--- a/test/QT/QTFLAGS.py
+++ b/test/QT/QTFLAGS.py
@@ -277,3 +277,9 @@ test.run(chdir='work2', stderr=None)
 test.must_exist(['work2', 'main' + _exe])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/Tool.py b/test/QT/Tool.py
index bb6b8513..86eb4ca7 100644
--- a/test/QT/Tool.py
+++ b/test/QT/Tool.py
@@ -151,3 +151,9 @@ env.Tool('qt', ['$TOOL_PATH'])
 test.run(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/copied-env.py b/test/QT/copied-env.py
index dc96317a..f68e1db2 100644
--- a/test/QT/copied-env.py
+++ b/test/QT/copied-env.py
@@ -79,3 +79,9 @@ if not MYLIB_IMPL:
     test.fail_test()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/empty-env.py b/test/QT/empty-env.py
index 5bf173a5..77547e70 100644
--- a/test/QT/empty-env.py
+++ b/test/QT/empty-env.py
@@ -69,3 +69,9 @@ test.run(program = test.workpath('main' + TestSCons._exe),
          stdout = 'qt/include/foo6.h\n')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/generated-ui.py b/test/QT/generated-ui.py
index 991047d2..e01a6338 100644
--- a/test/QT/generated-ui.py
+++ b/test/QT/generated-ui.py
@@ -127,3 +127,9 @@ test.run(arguments = '.',
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/installed.py b/test/QT/installed.py
index dde81c70..e9d2e163 100644
--- a/test/QT/installed.py
+++ b/test/QT/installed.py
@@ -211,3 +211,9 @@ test.fail_test(string.find(test.stderr(), expect1) == -1 and
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/manual.py b/test/QT/manual.py
index d3426dba..dcab3aae 100644
--- a/test/QT/manual.py
+++ b/test/QT/manual.py
@@ -139,3 +139,9 @@ test.must_exist(test.workpath('fff.cpp'))
 test.must_exist(test.workpath('fff.moc.cpp'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/moc-from-cpp.py b/test/QT/moc-from-cpp.py
index 1936a725..1bd7b101 100644
--- a/test/QT/moc-from-cpp.py
+++ b/test/QT/moc-from-cpp.py
@@ -97,3 +97,9 @@ test.run(arguments = "variant_dir=1 dup=0 " +
 test.must_exist(test.workpath('build_dup0', moc))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/moc-from-header.py b/test/QT/moc-from-header.py
index 102facc8..41b1b3dc 100644
--- a/test/QT/moc-from-header.py
+++ b/test/QT/moc-from-header.py
@@ -97,3 +97,9 @@ test.run(arguments = "variant_dir=1 chdir=1 dup=0 " +
 test.must_exist(['build_dup0', moc])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/reentrant.py b/test/QT/reentrant.py
index 336aa136..be464b93 100644
--- a/test/QT/reentrant.py
+++ b/test/QT/reentrant.py
@@ -65,3 +65,9 @@ test.run(program = test.workpath('main' + TestSCons._exe),
          stdout = 'qt/include/foo5.h\n')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/source-from-ui.py b/test/QT/source-from-ui.py
index 874285d2..6cffecc5 100644
--- a/test/QT/source-from-ui.py
+++ b/test/QT/source-from-ui.py
@@ -149,3 +149,9 @@ test.must_not_exist(test.workpath(cpp))
 test.must_not_exist(test.workpath(h))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/up-to-date.py b/test/QT/up-to-date.py
index 28ae16e6..fbbcac0d 100644
--- a/test/QT/up-to-date.py
+++ b/test/QT/up-to-date.py
@@ -139,3 +139,9 @@ test.up_to_date(options = '--debug=explain',
                 stderr=None)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/QT/warnings.py b/test/QT/warnings.py
index ef94dd6f..975091bf 100644
--- a/test/QT/warnings.py
+++ b/test/QT/warnings.py
@@ -98,3 +98,9 @@ File "%s", line \d+, in (\?|<module>)
 test.fail_test(not test.match_re(test.stderr(), expect))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RANLIB/RANLIB.py b/test/RANLIB/RANLIB.py
index 3cf9c054..eefbd157 100644
--- a/test/RANLIB/RANLIB.py
+++ b/test/RANLIB/RANLIB.py
@@ -106,3 +106,9 @@ test.run(arguments = 'b' + _exe,
 test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RANLIB/RANLIBCOM.py b/test/RANLIB/RANLIBCOM.py
index 312216b2..94f19979 100644
--- a/test/RANLIB/RANLIBCOM.py
+++ b/test/RANLIB/RANLIBCOM.py
@@ -79,3 +79,9 @@ test.must_match('output.lib', "file.1\nfile.2\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RANLIB/RANLIBCOMSTR.py b/test/RANLIB/RANLIBCOMSTR.py
index 6929ac65..b59d133d 100644
--- a/test/RANLIB/RANLIBCOMSTR.py
+++ b/test/RANLIB/RANLIBCOMSTR.py
@@ -86,3 +86,9 @@ test.must_match('output.lib', "file.1\nfile.2\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RANLIB/RANLIBFLAGS.py b/test/RANLIB/RANLIBFLAGS.py
index 08ee9671..45fcc00c 100644
--- a/test/RANLIB/RANLIBFLAGS.py
+++ b/test/RANLIB/RANLIBFLAGS.py
@@ -107,3 +107,9 @@ test.run(arguments = 'b' + _exe,
 test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RCS/RCS_COCOM.py b/test/RCS/RCS_COCOM.py
index 319a8519..8bbeb59c 100644
--- a/test/RCS/RCS_COCOM.py
+++ b/test/RCS/RCS_COCOM.py
@@ -119,3 +119,9 @@ test.must_match(['sub', 'all'],
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RCS/RCS_COCOMSTR.py b/test/RCS/RCS_COCOMSTR.py
index 30a3a57b..576afc1d 100644
--- a/test/RCS/RCS_COCOMSTR.py
+++ b/test/RCS/RCS_COCOMSTR.py
@@ -120,3 +120,9 @@ test.must_match(['sub', 'all'],
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RCS/changed.py b/test/RCS/changed.py
index 9a918db4..d451be05 100644
--- a/test/RCS/changed.py
+++ b/test/RCS/changed.py
@@ -93,3 +93,9 @@ test.run(program = test.workpath('main.exe'), stdout = "main.c 2\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RCS/diskcheck.py b/test/RCS/diskcheck.py
index b6b10700..264822a6 100644
--- a/test/RCS/diskcheck.py
+++ b/test/RCS/diskcheck.py
@@ -186,3 +186,9 @@ test.must_be_writable(test.workpath('sub', 'fff.in'))
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RCS/explicit.py b/test/RCS/explicit.py
index 46ed8b64..3e19a679 100644
--- a/test/RCS/explicit.py
+++ b/test/RCS/explicit.py
@@ -156,3 +156,9 @@ test.must_not_be_writable(test.workpath('sub', 'fff.in'))
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RCS/implicit.py b/test/RCS/implicit.py
index 3223901b..6677c55f 100644
--- a/test/RCS/implicit.py
+++ b/test/RCS/implicit.py
@@ -88,3 +88,9 @@ done
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RCS/transparent.py b/test/RCS/transparent.py
index 1aceb460..397017cb 100644
--- a/test/RCS/transparent.py
+++ b/test/RCS/transparent.py
@@ -171,3 +171,9 @@ test.must_be_writable(test.workpath('sub', 'fff.in'))
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/RPATH.py b/test/RPATH.py
index a0ae8c78..4e13bb1a 100644
--- a/test/RPATH.py
+++ b/test/RPATH.py
@@ -69,3 +69,9 @@ test.run(arguments='.')
 test.run(program=foo, chdir=test.workpath('.'), stdout='bar\n')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/CPPPATH.py b/test/Repository/CPPPATH.py
index 9db613e3..ff1dbfe3 100644
--- a/test/Repository/CPPPATH.py
+++ b/test/Repository/CPPPATH.py
@@ -95,3 +95,9 @@ test.up_to_date(chdir = 'work', options = opts, arguments = '.')
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/Default.py b/test/Repository/Default.py
index 82751c34..127c29aa 100644
--- a/test/Repository/Default.py
+++ b/test/Repository/Default.py
@@ -98,3 +98,9 @@ test.up_to_date(chdir = 'work', options = opts, arguments = '.')
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/Install-Local.py b/test/Repository/Install-Local.py
index b987670c..36310438 100644
--- a/test/Repository/Install-Local.py
+++ b/test/Repository/Install-Local.py
@@ -80,3 +80,9 @@ test.up_to_date(chdir = 'work', options = opts, arguments = 'install')
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/Install.py b/test/Repository/Install.py
index d0038e39..5e64d55d 100644
--- a/test/Repository/Install.py
+++ b/test/Repository/Install.py
@@ -57,3 +57,9 @@ test.up_to_date(chdir = 'work', options = opts, arguments = install)
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/InstallAs.py b/test/Repository/InstallAs.py
index 28b94216..0923d887 100644
--- a/test/Repository/InstallAs.py
+++ b/test/Repository/InstallAs.py
@@ -64,3 +64,9 @@ test.up_to_date(chdir = 'work', options = opts, arguments = install)
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/Java.py b/test/Repository/Java.py
index 2c5e30d1..5ad18555 100644
--- a/test/Repository/Java.py
+++ b/test/Repository/Java.py
@@ -261,3 +261,9 @@ test.writable('repository', 0)
 #test.up_to_date(chdir = 'work2', options = opts, arguments = ".")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/JavaH.py b/test/Repository/JavaH.py
index 9128b6d2..ee196cf4 100644
--- a/test/Repository/JavaH.py
+++ b/test/Repository/JavaH.py
@@ -288,3 +288,9 @@ test.fail_test(not os.path.exists(test.workpath('work3', 'outdir', 'Foo3.h')))
 #test.up_to_date(chdir = 'work2', options = opts, arguments = ".")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/LIBPATH.py b/test/Repository/LIBPATH.py
index 0f80acef..0eb2da26 100644
--- a/test/Repository/LIBPATH.py
+++ b/test/Repository/LIBPATH.py
@@ -130,3 +130,9 @@ test.fail_test(test.read(['work', 'yyy.out']) !=
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/Local.py b/test/Repository/Local.py
index a099e40c..1b63345d 100644
--- a/test/Repository/Local.py
+++ b/test/Repository/Local.py
@@ -112,3 +112,9 @@ test.up_to_date(chdir = 'work', options = opts, arguments = '.')
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/M4.py b/test/Repository/M4.py
index 09c38618..b6c97360 100644
--- a/test/Repository/M4.py
+++ b/test/Repository/M4.py
@@ -101,3 +101,9 @@ test.fail_test(test.read(test.workpath('work', 'build', 'bbb.y'), 'r') != expect
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/Program.py b/test/Repository/Program.py
index eda12021..1eb18d87 100644
--- a/test/Repository/Program.py
+++ b/test/Repository/Program.py
@@ -360,3 +360,9 @@ test.up_to_date(chdir = 'work2', arguments = '.')
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/RMIC.py b/test/Repository/RMIC.py
index f3c412b3..ea48d2c9 100644
--- a/test/Repository/RMIC.py
+++ b/test/Repository/RMIC.py
@@ -347,3 +347,9 @@ test.must_exist    (test.workpath('work3', 'outdir', 'com', 'sub', 'foo', 'Foo2_
 test.up_to_date(chdir = 'work3', options = opts, arguments = ".")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/SConscript.py b/test/Repository/SConscript.py
index 5f2e6b8d..fb4ef082 100644
--- a/test/Repository/SConscript.py
+++ b/test/Repository/SConscript.py
@@ -125,3 +125,9 @@ rep2/src/ccc.in
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/SConsignFile.py b/test/Repository/SConsignFile.py
index 9643cb84..fef2c759 100644
--- a/test/Repository/SConsignFile.py
+++ b/test/Repository/SConsignFile.py
@@ -59,3 +59,9 @@ test.run(chdir='work',
 test.must_not_exist(['work', 'file.out'])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/SharedLibrary.py b/test/Repository/SharedLibrary.py
index 6b65def6..fbd135e8 100644
--- a/test/Repository/SharedLibrary.py
+++ b/test/Repository/SharedLibrary.py
@@ -122,3 +122,9 @@ test.run(program = test.workpath('work', 'prog'),
          stdout = "f1.c\nf2.c\nf3.c\nprog.c\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/StaticLibrary.py b/test/Repository/StaticLibrary.py
index 1cf20c35..e5c76f97 100644
--- a/test/Repository/StaticLibrary.py
+++ b/test/Repository/StaticLibrary.py
@@ -234,3 +234,9 @@ test.up_to_date(chdir = 'work3', options = opts, arguments = ".")
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/VariantDir.py b/test/Repository/VariantDir.py
index ea11404f..0abda0bd 100644
--- a/test/Repository/VariantDir.py
+++ b/test/Repository/VariantDir.py
@@ -197,3 +197,9 @@ test.up_to_date(chdir = 'work2', options = opts, arguments = '.')
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/absolute-path.py b/test/Repository/absolute-path.py
index 378e3211..5bd10e44 100644
--- a/test/Repository/absolute-path.py
+++ b/test/Repository/absolute-path.py
@@ -107,3 +107,9 @@ test.up_to_date(chdir = 'work', options = opts, arguments = '.')
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/include.py b/test/Repository/include.py
index 4575d994..c52765c4 100644
--- a/test/Repository/include.py
+++ b/test/Repository/include.py
@@ -188,3 +188,9 @@ test.up_to_date(chdir = 'work', arguments = '.')
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/link-object.py b/test/Repository/link-object.py
index 679fa7e5..78add900 100644
--- a/test/Repository/link-object.py
+++ b/test/Repository/link-object.py
@@ -155,3 +155,9 @@ test.up_to_date(chdir = 'repository', arguments = ".")
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/multi-dir.py b/test/Repository/multi-dir.py
index ab67c9dc..8a82126a 100644
--- a/test/Repository/multi-dir.py
+++ b/test/Repository/multi-dir.py
@@ -138,3 +138,9 @@ repository/src/main.c
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/no-SConsignFile.py b/test/Repository/no-SConsignFile.py
index 95b1749f..d7f570c4 100644
--- a/test/Repository/no-SConsignFile.py
+++ b/test/Repository/no-SConsignFile.py
@@ -73,3 +73,9 @@ test.run(program=test.workpath('build', 'foo'),
 test.up_to_date(chdir='build', arguments='.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/no-repository.py b/test/Repository/no-repository.py
index a8ec7cab..dc45825b 100644
--- a/test/Repository/no-repository.py
+++ b/test/Repository/no-repository.py
@@ -94,3 +94,9 @@ work/foo.c
 test.up_to_date(chdir = 'work', arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/option-c.py b/test/Repository/option-c.py
index 1d440eb0..ea989c27 100644
--- a/test/Repository/option-c.py
+++ b/test/Repository/option-c.py
@@ -180,3 +180,9 @@ test.fail_test(test.read(repository_subdir_ddd_out) != "repository/subdir/ddd.in
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/option-f.py b/test/Repository/option-f.py
index 46151047..aec94183 100644
--- a/test/Repository/option-f.py
+++ b/test/Repository/option-f.py
@@ -97,3 +97,9 @@ test.fail_test(test.read(['work', 'ccc.out']) != "repository/ccc.in\n")
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/option-n.py b/test/Repository/option-n.py
index c6793fcb..220baadf 100644
--- a/test/Repository/option-n.py
+++ b/test/Repository/option-n.py
@@ -92,3 +92,9 @@ test.fail_test(test.read(work_aaa_out) != "repository/aaa.in\n")
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/signature-order.py b/test/Repository/signature-order.py
index fd361828..2c00b34a 100644
--- a/test/Repository/signature-order.py
+++ b/test/Repository/signature-order.py
@@ -120,3 +120,9 @@ test.up_to_date(chdir = 'work', arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/targets.py b/test/Repository/targets.py
index 28390468..d3950478 100644
--- a/test/Repository/targets.py
+++ b/test/Repository/targets.py
@@ -97,3 +97,9 @@ test.fail_test(test.read(['work', 'ccc.out']) != "repository/ccc.in\n")
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/top-level-path.py b/test/Repository/top-level-path.py
index 4dccfd55..d8ed9e24 100644
--- a/test/Repository/top-level-path.py
+++ b/test/Repository/top-level-path.py
@@ -106,3 +106,9 @@ test.up_to_date(chdir = 'work', options = opts, arguments = '.')
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/variants.py b/test/Repository/variants.py
index a85d095e..e8c07a78 100644
--- a/test/Repository/variants.py
+++ b/test/Repository/variants.py
@@ -422,3 +422,9 @@ test.fail_test(os.path.exists(test.workpath('work2', 'src2', '.sconsign')))
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Repository/within-repository.py b/test/Repository/within-repository.py
index 0b7e844b..6bcc2fae 100644
--- a/test/Repository/within-repository.py
+++ b/test/Repository/within-repository.py
@@ -149,3 +149,9 @@ test.up_to_date(chdir = 'repository', arguments = ".")
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Requires/basic.py b/test/Requires/basic.py
index 59cdd37d..548e6b2a 100644
--- a/test/Requires/basic.py
+++ b/test/Requires/basic.py
@@ -93,3 +93,9 @@ test.must_match('file.out', "file.in 4\nprereq.in 3\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Rpcgen/RPCGEN.py b/test/Rpcgen/RPCGEN.py
index 8edb7b7e..7430ba73 100644
--- a/test/Rpcgen/RPCGEN.py
+++ b/test/Rpcgen/RPCGEN.py
@@ -149,3 +149,9 @@ int main(int argc, char **args) {
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Rpcgen/RPCGENCLIENTFLAGS.py b/test/Rpcgen/RPCGENCLIENTFLAGS.py
index 5bf14cee..7da01119 100644
--- a/test/Rpcgen/RPCGENCLIENTFLAGS.py
+++ b/test/Rpcgen/RPCGENCLIENTFLAGS.py
@@ -83,3 +83,9 @@ test.must_match('rpcif_xdr.c',  expect_xdr)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Rpcgen/RPCGENFLAGS.py b/test/Rpcgen/RPCGENFLAGS.py
index f18dba27..8f70adf9 100644
--- a/test/Rpcgen/RPCGENFLAGS.py
+++ b/test/Rpcgen/RPCGENFLAGS.py
@@ -82,3 +82,9 @@ test.must_match('rpcif_xdr.c', expect_xdr)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Rpcgen/RPCGENHEADERFLAGS.py b/test/Rpcgen/RPCGENHEADERFLAGS.py
index c1eac5a4..840973fa 100644
--- a/test/Rpcgen/RPCGENHEADERFLAGS.py
+++ b/test/Rpcgen/RPCGENHEADERFLAGS.py
@@ -83,3 +83,9 @@ test.must_match('rpcif_xdr.c',  expect_xdr)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Rpcgen/RPCGENSERVICEFLAGS.py b/test/Rpcgen/RPCGENSERVICEFLAGS.py
index bf88a246..db8f354d 100644
--- a/test/Rpcgen/RPCGENSERVICEFLAGS.py
+++ b/test/Rpcgen/RPCGENSERVICEFLAGS.py
@@ -83,3 +83,9 @@ test.must_match('rpcif_xdr.c',  expect_xdr)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Rpcgen/RPCGENXDRFLAGS.py b/test/Rpcgen/RPCGENXDRFLAGS.py
index 85ec6dc6..d185bcf8 100644
--- a/test/Rpcgen/RPCGENXDRFLAGS.py
+++ b/test/Rpcgen/RPCGENXDRFLAGS.py
@@ -83,3 +83,9 @@ test.must_match('rpcif_xdr.c',  expect_xdr)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SCCS/SCCSCOM.py b/test/SCCS/SCCSCOM.py
index f7a210c1..771b7736 100644
--- a/test/SCCS/SCCSCOM.py
+++ b/test/SCCS/SCCSCOM.py
@@ -119,3 +119,9 @@ test.must_match(['sub', 'all'],
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SCCS/SCCSCOMSTR.py b/test/SCCS/SCCSCOMSTR.py
index be5d8078..162fe3cb 100644
--- a/test/SCCS/SCCSCOMSTR.py
+++ b/test/SCCS/SCCSCOMSTR.py
@@ -120,3 +120,9 @@ test.must_match(['sub', 'all'],
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SCCS/diskcheck.py b/test/SCCS/diskcheck.py
index 1845dc31..8d30d332 100644
--- a/test/SCCS/diskcheck.py
+++ b/test/SCCS/diskcheck.py
@@ -140,3 +140,9 @@ test.must_not_be_writable(test.workpath('sub', 'fff.in'))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SCCS/explicit.py b/test/SCCS/explicit.py
index dbfcb513..f716dd09 100644
--- a/test/SCCS/explicit.py
+++ b/test/SCCS/explicit.py
@@ -126,3 +126,9 @@ test.must_be_writable(test.workpath('sub', 'fff.in'))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SCCS/implicit.py b/test/SCCS/implicit.py
index aa5501fc..79eaf06b 100644
--- a/test/SCCS/implicit.py
+++ b/test/SCCS/implicit.py
@@ -80,3 +80,9 @@ test.must_contain_all_lines(test.stdout(), lines)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SCCS/transparent.py b/test/SCCS/transparent.py
index 82577d21..adc0fe10 100644
--- a/test/SCCS/transparent.py
+++ b/test/SCCS/transparent.py
@@ -126,3 +126,9 @@ test.must_not_be_writable(test.workpath('sub', 'fff.in'))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SCONSFLAGS.py b/test/SCONSFLAGS.py
index e64e6873..387cb264 100644
--- a/test/SCONSFLAGS.py
+++ b/test/SCONSFLAGS.py
@@ -74,3 +74,9 @@ test.run(arguments = "-H", status = 2,
          stderr = TestSCons.re_escape(expect))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SCONS_LIB_DIR.py b/test/SCONS_LIB_DIR.py
index e784e2b6..95a377a9 100644
--- a/test/SCONS_LIB_DIR.py
+++ b/test/SCONS_LIB_DIR.py
@@ -47,3 +47,8 @@ test.run(stdout = expect)
 
 test.pass_test()
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscript/Return.py b/test/SConscript/Return.py
index 2ef4559d..a810c7c8 100644
--- a/test/SConscript/Return.py
+++ b/test/SConscript/Return.py
@@ -103,3 +103,9 @@ bar = bar
 test.run(arguments = '-q -Q', stdout=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscript/SConscript.py b/test/SConscript/SConscript.py
index 268c48e2..fa7e9144 100644
--- a/test/SConscript/SConscript.py
+++ b/test/SConscript/SConscript.py
@@ -217,3 +217,9 @@ test.run(arguments = ".",
                                    build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscript/SConscriptChdir.py b/test/SConscript/SConscriptChdir.py
index 348f87e7..99810e3c 100644
--- a/test/SConscript/SConscriptChdir.py
+++ b/test/SConscript/SConscriptChdir.py
@@ -82,3 +82,9 @@ test.fail_test(test.read('test.txt') != "This is the dir3 test.\nThis is the dir
 test.fail_test(test.read(['dir4', 'test.txt']) != "This is the dir4 test.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscript/env.py b/test/SConscript/env.py
index 0ad05619..42963ff9 100644
--- a/test/SConscript/env.py
+++ b/test/SConscript/env.py
@@ -88,3 +88,9 @@ assert SCons.Script.SConscript.sconscript_reading == 1
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscript/src_dir.py b/test/SConscript/src_dir.py
index 6e48e068..1a3a3df9 100644
--- a/test/SConscript/src_dir.py
+++ b/test/SConscript/src_dir.py
@@ -97,3 +97,9 @@ test.run(program = goodbye, stdout = "Goodbye, world!\n")
 test.run(program = hello, stdout = "Hello, world!\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscript/variables.py b/test/SConscript/variables.py
index 34f52a0c..dd51155c 100644
--- a/test/SConscript/variables.py
+++ b/test/SConscript/variables.py
@@ -167,3 +167,9 @@ assert y == 'zoom'
 test.run(arguments = ".")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscript/white-space.py b/test/SConscript/white-space.py
index 87eb701e..06acea8a 100644
--- a/test/SConscript/white-space.py
+++ b/test/SConscript/white-space.py
@@ -48,3 +48,9 @@ test.run(arguments = ".", stdout = expect)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConscriptChdir.py b/test/SConscriptChdir.py
index 348f87e7..99810e3c 100644
--- a/test/SConscriptChdir.py
+++ b/test/SConscriptChdir.py
@@ -82,3 +82,9 @@ test.fail_test(test.read('test.txt') != "This is the dir3 test.\nThis is the dir
 test.fail_test(test.read(['dir4', 'test.txt']) != "This is the dir4 test.\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConsignFile/default.py b/test/SConsignFile/default.py
index 2e76c3db..f38aec8d 100644
--- a/test/SConsignFile/default.py
+++ b/test/SConsignFile/default.py
@@ -80,3 +80,9 @@ test.must_not_exist(test.workpath('.sconsign'))
 test.must_not_exist(test.workpath('subdir', '.sconsign'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConsignFile/explicit-file.py b/test/SConsignFile/explicit-file.py
index 1c087ac0..33963c27 100644
--- a/test/SConsignFile/explicit-file.py
+++ b/test/SConsignFile/explicit-file.py
@@ -80,3 +80,9 @@ test.must_not_exist(test.workpath('.sconsign'))
 test.must_not_exist(test.workpath('subdir', '.sconsign'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConsignFile/make-directory.py b/test/SConsignFile/make-directory.py
index 46f4da0f..50bab798 100644
--- a/test/SConsignFile/make-directory.py
+++ b/test/SConsignFile/make-directory.py
@@ -65,3 +65,9 @@ test.must_match(['bar', 'foo.txt'], "Foo\n")
 test.must_exist(['sub', 'dir', 'sconsign.dblite'])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SConstruct.py b/test/SConstruct.py
index b3fe9a01..4b80f3e0 100644
--- a/test/SConstruct.py
+++ b/test/SConstruct.py
@@ -69,3 +69,9 @@ test.run(arguments = ".",
                                    build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SHELL.py b/test/SHELL.py
index b946189b..fa1ae78e 100644
--- a/test/SHELL.py
+++ b/test/SHELL.py
@@ -81,3 +81,9 @@ test.run()
 test.must_match('file.out', "file.in\nextra.txt\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SPAWN.py b/test/SPAWN.py
index 2a3632eb..c7cd4e41 100644
--- a/test/SPAWN.py
+++ b/test/SPAWN.py
@@ -85,3 +85,9 @@ test.must_match('file3.out', "file3.in\nextra1.txt\n")
 test.must_match('file4.out', "file4.in\nextra2.txt\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/SWIG.py b/test/SWIG/SWIG.py
index 491cb7c7..d76ef648 100644
--- a/test/SWIG/SWIG.py
+++ b/test/SWIG/SWIG.py
@@ -100,3 +100,9 @@ test.must_exist(test.workpath('test3_wrap.cc'))
 test.must_exist(test.workpath('test3_wrap' + _obj))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/SWIGCOM.py b/test/SWIG/SWIGCOM.py
index 20d2d5d2..d1d77763 100644
--- a/test/SWIG/SWIGCOM.py
+++ b/test/SWIG/SWIGCOM.py
@@ -64,3 +64,9 @@ test.must_match('bbb_wrap.cc', "bbb.i\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/SWIGCOMSTR.py b/test/SWIG/SWIGCOMSTR.py
index b991d774..739c7811 100644
--- a/test/SWIG/SWIGCOMSTR.py
+++ b/test/SWIG/SWIGCOMSTR.py
@@ -69,3 +69,9 @@ test.must_match('bbb_wrap.cc', "bbb.i\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/SWIGFLAGS.py b/test/SWIG/SWIGFLAGS.py
index 27fa5e3c..88f51849 100644
--- a/test/SWIG/SWIGFLAGS.py
+++ b/test/SWIG/SWIGFLAGS.py
@@ -65,3 +65,9 @@ test.up_to_date(arguments = "foo_wrap.c")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/SWIGOUTDIR.py b/test/SWIG/SWIGOUTDIR.py
index dedc03ce..fe5b8a09 100644
--- a/test/SWIG/SWIGOUTDIR.py
+++ b/test/SWIG/SWIGOUTDIR.py
@@ -83,3 +83,9 @@ test.must_exist('java/build dir/foopack.java')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/SWIGPATH.py b/test/SWIG/SWIGPATH.py
index dd2db47e..4832814c 100644
--- a/test/SWIG/SWIGPATH.py
+++ b/test/SWIG/SWIGPATH.py
@@ -89,3 +89,9 @@ test.up_to_date(arguments = "dependent_wrap.c")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/build-dir.py b/test/SWIG/build-dir.py
index 1bee0c2e..5fa3cebe 100644
--- a/test/SWIG/build-dir.py
+++ b/test/SWIG/build-dir.py
@@ -168,3 +168,9 @@ test.run(arguments = '.')
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/implicit-dependencies.py b/test/SWIG/implicit-dependencies.py
index 99aa59c7..49f9cc75 100644
--- a/test/SWIG/implicit-dependencies.py
+++ b/test/SWIG/implicit-dependencies.py
@@ -70,3 +70,9 @@ test.not_up_to_date(arguments = "dependent_wrap.c")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/live.py b/test/SWIG/live.py
index 1c19e30d..0caa9b5d 100644
--- a/test/SWIG/live.py
+++ b/test/SWIG/live.py
@@ -178,3 +178,9 @@ test.up_to_date(arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/module-parens.py b/test/SWIG/module-parens.py
index 7b48a764..f80e10c4 100644
--- a/test/SWIG/module-parens.py
+++ b/test/SWIG/module-parens.py
@@ -115,3 +115,9 @@ test.must_exist('test2_wrap.h')
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/module-quoted.py b/test/SWIG/module-quoted.py
index 97a38b04..20015824 100644
--- a/test/SWIG/module-quoted.py
+++ b/test/SWIG/module-quoted.py
@@ -90,3 +90,9 @@ test.run(arguments = '.')
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/noproxy.py b/test/SWIG/noproxy.py
index edbffb19..0d109b85 100644
--- a/test/SWIG/noproxy.py
+++ b/test/SWIG/noproxy.py
@@ -88,3 +88,9 @@ test.up_to_date(arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/remove-modules.py b/test/SWIG/remove-modules.py
index fad85778..e0e91da8 100644
--- a/test/SWIG/remove-modules.py
+++ b/test/SWIG/remove-modules.py
@@ -95,3 +95,9 @@ test.must_not_exist(test.workpath("modulename.py"))
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SWIG/subdir.py b/test/SWIG/subdir.py
index c3c8cf0d..6a746f36 100644
--- a/test/SWIG/subdir.py
+++ b/test/SWIG/subdir.py
@@ -112,3 +112,9 @@ test.run(arguments = '.')
 test.up_to_date(options = '--debug=explain', arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/Entry-to-Dir.py b/test/Scanner/Entry-to-Dir.py
index 0b5dbd71..423a717e 100644
--- a/test/Scanner/Entry-to-Dir.py
+++ b/test/Scanner/Entry-to-Dir.py
@@ -57,3 +57,9 @@ test.run(arguments = '.')
 test.run(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/FindPathDirs.py b/test/Scanner/FindPathDirs.py
index bb8f9296..9f0e5357 100644
--- a/test/Scanner/FindPathDirs.py
+++ b/test/Scanner/FindPathDirs.py
@@ -148,3 +148,9 @@ test.must_match('foo', "foo.k 1 line 1\ninc1/xxx 2\ninc1/yyy 2\nfoo.k 1 line 4\n
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/Scanner.py b/test/Scanner/Scanner.py
index 80eab03a..4c84069f 100644
--- a/test/Scanner/Scanner.py
+++ b/test/Scanner/Scanner.py
@@ -238,3 +238,9 @@ test.must_match('moo.ork', "xxx 2\nmoo.lork 1 line 2\nyyy 2\nmoo.lork 1 line 4\n
 test.up_to_date(arguments = 'foo')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/dictionary.py b/test/Scanner/dictionary.py
index b3baaa32..a65e7772 100644
--- a/test/Scanner/dictionary.py
+++ b/test/Scanner/dictionary.py
@@ -197,3 +197,9 @@ test.must_match('bbb', expect_bbb)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/empty-implicit.py b/test/Scanner/empty-implicit.py
index 2112fd83..03232409 100644
--- a/test/Scanner/empty-implicit.py
+++ b/test/Scanner/empty-implicit.py
@@ -79,3 +79,9 @@ test.run(arguments = '--implicit-cache .', stdout = expect)
 test.up_to_date(options = '--implicit-cache', arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/exception.py b/test/Scanner/exception.py
index ceaca14f..4e62f8f3 100644
--- a/test/Scanner/exception.py
+++ b/test/Scanner/exception.py
@@ -111,3 +111,9 @@ scons: *** [foo] Exception : kfile_scan error:  yyy 1
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/generated.py b/test/Scanner/generated.py
index df7f20a4..f2d19555 100644
--- a/test/Scanner/generated.py
+++ b/test/Scanner/generated.py
@@ -420,3 +420,9 @@ libg_w.h: 1
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/multi-env.py b/test/Scanner/multi-env.py
index c64f970d..3d9a62a5 100644
--- a/test/Scanner/multi-env.py
+++ b/test/Scanner/multi-env.py
@@ -114,3 +114,9 @@ test.must_match('frog.1', 'croak\ninput sound2\n')
 test.must_match('frog.2', 'include sound1\nrudeep\n')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/no-Dir-node.py b/test/Scanner/no-Dir-node.py
index b5706e3f..a780de1f 100644
--- a/test/Scanner/no-Dir-node.py
+++ b/test/Scanner/no-Dir-node.py
@@ -134,3 +134,9 @@ test.must_match('list.out', """\
 """ % locals())
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/parallel-rescan.py b/test/Scanner/parallel-rescan.py
index 4a1f27e9..9f8e3f14 100644
--- a/test/Scanner/parallel-rescan.py
+++ b/test/Scanner/parallel-rescan.py
@@ -70,3 +70,9 @@ test.run(arguments = '-j4 .',
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/scan-once.py b/test/Scanner/scan-once.py
index 7e02dd27..d68f9188 100644
--- a/test/Scanner/scan-once.py
+++ b/test/Scanner/scan-once.py
@@ -92,3 +92,9 @@ create file4.x from file3.x
 """))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/source_scanner-dict.py b/test/Scanner/source_scanner-dict.py
index 5c0a89f9..f7963681 100644
--- a/test/Scanner/source_scanner-dict.py
+++ b/test/Scanner/source_scanner-dict.py
@@ -216,3 +216,9 @@ test.must_match('ddd', expect_ddd)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Script-import.py b/test/Script-import.py
index 3df980ff..2e1b6092 100644
--- a/test/Script-import.py
+++ b/test/Script-import.py
@@ -105,3 +105,9 @@ test.run(arguments = '.')
 test.must_match("file.out", "file.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SideEffect/basic.py b/test/SideEffect/basic.py
index f0754309..0ded6b69 100644
--- a/test/SideEffect/basic.py
+++ b/test/SideEffect/basic.py
@@ -105,3 +105,9 @@ foo.in -> foo.out
 test.must_match('log.txt', expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SideEffect/directory.py b/test/SideEffect/directory.py
index ec4f2615..23f50afd 100644
--- a/test/SideEffect/directory.py
+++ b/test/SideEffect/directory.py
@@ -71,3 +71,9 @@ test.must_exist(test.workpath('log', 'bar.out'))
 test.must_exist(test.workpath('log', 'blat.out'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SideEffect/parallel.py b/test/SideEffect/parallel.py
index de4f578b..ff883c47 100644
--- a/test/SideEffect/parallel.py
+++ b/test/SideEffect/parallel.py
@@ -97,3 +97,9 @@ test.must_contain_all_lines(test.read('log.txt'), log_lines)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SideEffect/variant_dir.py b/test/SideEffect/variant_dir.py
index 44fbd799..cc7b8e98 100644
--- a/test/SideEffect/variant_dir.py
+++ b/test/SideEffect/variant_dir.py
@@ -75,3 +75,9 @@ bar.in -> %s
 test.must_match('build/log.txt', expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Sig.py b/test/Sig.py
index 85657350..1ae118b7 100644
--- a/test/Sig.py
+++ b/test/Sig.py
@@ -60,3 +60,9 @@ scons: warning: The SCons.Sig module no longer exists.
 test.run(arguments = '.', stderr=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/SourceCode.py b/test/SourceCode.py
index 2c01158e..0f8a5c1f 100644
--- a/test/SourceCode.py
+++ b/test/SourceCode.py
@@ -103,3 +103,9 @@ test.must_match('all', "sub/sc-aaa.in\nsub/sc-bbb.in\nsub/sc-ccc.in\n")
 test.must_match('ddd.out', "sub2/sc-ddd.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Split.py b/test/Split.py
index 9902bba8..e98e299a 100644
--- a/test/Split.py
+++ b/test/Split.py
@@ -61,3 +61,9 @@ test.run(arguments = ".",
                                    build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Subst/AllowSubstExceptions.py b/test/Subst/AllowSubstExceptions.py
index 5709428e..6401f7e7 100644
--- a/test/Subst/AllowSubstExceptions.py
+++ b/test/Subst/AllowSubstExceptions.py
@@ -91,3 +91,9 @@ test.run()
 #print test.stdout()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Subst/SyntaxError.py b/test/Subst/SyntaxError.py
index b37cdf4b..94be4680 100644
--- a/test/Subst/SyntaxError.py
+++ b/test/Subst/SyntaxError.py
@@ -72,3 +72,9 @@ test.run(status=2, stderr=expect)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Subst/TypeError.py b/test/Subst/TypeError.py
index d042b6de..ed000fd1 100644
--- a/test/Subst/TypeError.py
+++ b/test/Subst/TypeError.py
@@ -90,3 +90,9 @@ test.run(status=2, stderr=expect)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Subst/null-sources-attr.py b/test/Subst/null-sources-attr.py
index ac3ffd87..64a0b5ba 100644
--- a/test/Subst/null-sources-attr.py
+++ b/test/Subst/null-sources-attr.py
@@ -61,3 +61,9 @@ test.must_match('out1', "file1\nfile2\nfile3\n")
 test.must_match('out2', "file1\nfile2\nfile3\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Subversion.py b/test/Subversion.py
index 74ff86c0..b164d8e9 100644
--- a/test/Subversion.py
+++ b/test/Subversion.py
@@ -167,3 +167,9 @@ test.fail_test(test.read(['work2', 'all']) != "import/aaa.in\nwork2/bbb.in\nimpo
 test.fail_test(test.read(['work2', 'sub', 'all']) != "import/sub/ddd.in\nwork2/sub/eee.in\nimport/sub/fff.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TAR/TAR.py b/test/TAR/TAR.py
index 8a9a1977..f56a5e95 100644
--- a/test/TAR/TAR.py
+++ b/test/TAR/TAR.py
@@ -161,3 +161,9 @@ f5.Tar(target = 'f5.tgz', source = ['file23', 'file24'])
     test.fail_test(test.stdout() != "file22\nfile23\nfile24\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TAR/TARCOM.py b/test/TAR/TARCOM.py
index a7313b37..fcf45887 100644
--- a/test/TAR/TARCOM.py
+++ b/test/TAR/TARCOM.py
@@ -65,3 +65,9 @@ test.must_match('test1.tar', "test1.in\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TAR/TARCOMSTR.py b/test/TAR/TARCOMSTR.py
index eee9b16f..70b6c699 100644
--- a/test/TAR/TARCOMSTR.py
+++ b/test/TAR/TARCOMSTR.py
@@ -65,3 +65,9 @@ test.must_match('aaa.tar', "aaa.in\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TAR/TARFLAGS.py b/test/TAR/TARFLAGS.py
index f2973b48..40031ce6 100644
--- a/test/TAR/TARFLAGS.py
+++ b/test/TAR/TARFLAGS.py
@@ -138,3 +138,9 @@ bar.Tar(target = 'bar.tar', source = 'file15')
     test.fail_test(test.stdout() != "file13\nfile14\nfile15\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TARGET-dir.py b/test/TARGET-dir.py
index 7155f931..d56127d8 100644
--- a/test/TARGET-dir.py
+++ b/test/TARGET-dir.py
@@ -88,3 +88,9 @@ test.run(program = build1_foo, stdout = "foo.h.in\nfoo.c\n")
 test.run(program = build2_foo, stdout = "foo.h.in\nfoo.c\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TARGETS.py b/test/TARGETS.py
index d2520d57..bf278aaf 100644
--- a/test/TARGETS.py
+++ b/test/TARGETS.py
@@ -138,3 +138,9 @@ test.run(arguments = 'command_line_target', stdout = expect)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEMPFILEPREFIX.py b/test/TEMPFILEPREFIX.py
index 7fabb7c8..f9b3240f 100644
--- a/test/TEMPFILEPREFIX.py
+++ b/test/TEMPFILEPREFIX.py
@@ -68,3 +68,9 @@ xxx.py -via\\S+
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/LATEX.py b/test/TEX/LATEX.py
index 704443a5..a45b032b 100644
--- a/test/TEX/LATEX.py
+++ b/test/TEX/LATEX.py
@@ -201,3 +201,9 @@ This is the include file. mod %s
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/LATEX2.py b/test/TEX/LATEX2.py
index b67c2b1a..9e4145c0 100644
--- a/test/TEX/LATEX2.py
+++ b/test/TEX/LATEX2.py
@@ -121,3 +121,9 @@ This is the include file. mod %s
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/LATEXCOM.py b/test/TEX/LATEXCOM.py
index dee78e92..81ab3deb 100644
--- a/test/TEX/LATEXCOM.py
+++ b/test/TEX/LATEXCOM.py
@@ -66,3 +66,9 @@ test.must_match('test1.dvi', "test1.latex\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/LATEXCOMSTR.py b/test/TEX/LATEXCOMSTR.py
index 043bab56..0a212fe8 100644
--- a/test/TEX/LATEXCOMSTR.py
+++ b/test/TEX/LATEXCOMSTR.py
@@ -70,3 +70,9 @@ test.must_match('test1.dvi', "test1.latex\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/LATEXFLAGS.py b/test/TEX/LATEXFLAGS.py
index 568d2a8d..ff1bf526 100644
--- a/test/TEX/LATEXFLAGS.py
+++ b/test/TEX/LATEXFLAGS.py
@@ -122,3 +122,9 @@ This is the %s LaTeX file.
     test.fail_test(not os.path.exists(test.workpath('bar.dvi')))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFLATEX.py b/test/TEX/PDFLATEX.py
index af8031a6..1d7f4499 100644
--- a/test/TEX/PDFLATEX.py
+++ b/test/TEX/PDFLATEX.py
@@ -140,3 +140,9 @@ This is the %s LaTeX file.
     test.must_exist('bar.pdf')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFLATEXCOM.py b/test/TEX/PDFLATEXCOM.py
index 1887fb05..b05052ac 100644
--- a/test/TEX/PDFLATEXCOM.py
+++ b/test/TEX/PDFLATEXCOM.py
@@ -66,3 +66,9 @@ test.must_match('test1.pdf', "test1.latex\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFLATEXCOMSTR.py b/test/TEX/PDFLATEXCOMSTR.py
index 6b08d081..2e9ba8a7 100644
--- a/test/TEX/PDFLATEXCOMSTR.py
+++ b/test/TEX/PDFLATEXCOMSTR.py
@@ -71,3 +71,9 @@ test.must_match('test1.pdf', "test1.latex\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFLATEXFLAGS.py b/test/TEX/PDFLATEXFLAGS.py
index 07a1d541..f007277f 100644
--- a/test/TEX/PDFLATEXFLAGS.py
+++ b/test/TEX/PDFLATEXFLAGS.py
@@ -122,3 +122,9 @@ This is the %s LaTeX file.
     test.fail_test(not os.path.exists(test.workpath('bar.pdf')))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFTEX.py b/test/TEX/PDFTEX.py
index b3951f93..61fac1e9 100644
--- a/test/TEX/PDFTEX.py
+++ b/test/TEX/PDFTEX.py
@@ -125,3 +125,9 @@ This is the %s TeX file.
     test.must_exist('bar.pdf')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFTEXCOM.py b/test/TEX/PDFTEXCOM.py
index 6c4b6aee..b6b58753 100644
--- a/test/TEX/PDFTEXCOM.py
+++ b/test/TEX/PDFTEXCOM.py
@@ -66,3 +66,9 @@ test.must_match('test1.pdf', "test1.tex\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFTEXCOMSTR.py b/test/TEX/PDFTEXCOMSTR.py
index 1332b647..e1fbc5c8 100644
--- a/test/TEX/PDFTEXCOMSTR.py
+++ b/test/TEX/PDFTEXCOMSTR.py
@@ -71,3 +71,9 @@ test.must_match('test1.pdf', "test1.tex\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDFTEXFLAGS.py b/test/TEX/PDFTEXFLAGS.py
index 5ae18255..eb78ec8f 100644
--- a/test/TEX/PDFTEXFLAGS.py
+++ b/test/TEX/PDFTEXFLAGS.py
@@ -113,3 +113,9 @@ This is the %s TeX file.
     test.fail_test(not os.path.exists(test.workpath('bar.pdf')))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/PDF_single_source.py b/test/TEX/PDF_single_source.py
index 5d466055..aefdd3e1 100644
--- a/test/TEX/PDF_single_source.py
+++ b/test/TEX/PDF_single_source.py
@@ -135,3 +135,9 @@ for f in files:
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/TEX.py b/test/TEX/TEX.py
index c78ad18a..3b2a6bec 100644
--- a/test/TEX/TEX.py
+++ b/test/TEX/TEX.py
@@ -189,3 +189,9 @@ Run \texttt{latex}, then \texttt{bibtex}, then \texttt{latex} twice again \cite{
         test.fail_test()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/TEXCOM.py b/test/TEX/TEXCOM.py
index c7a1b9ac..0224341b 100644
--- a/test/TEX/TEXCOM.py
+++ b/test/TEX/TEXCOM.py
@@ -66,3 +66,9 @@ test.must_match('test1.dvi', "test1.tex\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/TEXCOMSTR.py b/test/TEX/TEXCOMSTR.py
index 124868bf..6c0e1f9d 100644
--- a/test/TEX/TEXCOMSTR.py
+++ b/test/TEX/TEXCOMSTR.py
@@ -70,3 +70,9 @@ test.must_match('test1.dvi', "test1.tex\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/TEXFLAGS.py b/test/TEX/TEXFLAGS.py
index 6dcf95d2..1f9a2e1e 100644
--- a/test/TEX/TEXFLAGS.py
+++ b/test/TEX/TEXFLAGS.py
@@ -113,3 +113,9 @@ This is the %s TeX file.
     test.fail_test(not os.path.exists(test.workpath('bar.dvi')))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/auxiliaries.py b/test/TEX/auxiliaries.py
index aa41663a..f69b6e66 100644
--- a/test/TEX/auxiliaries.py
+++ b/test/TEX/auxiliaries.py
@@ -165,3 +165,9 @@ if ps_output_1 != ps_output_2:
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/bibliography.py b/test/TEX/bibliography.py
index 1e09af2f..158fb92b 100644
--- a/test/TEX/bibliography.py
+++ b/test/TEX/bibliography.py
@@ -207,3 +207,9 @@ test.write('d-toc.tex', r"""
 \listoftables
 \cleardoublepage
 """)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/bibtex-latex-rerun.py b/test/TEX/bibtex-latex-rerun.py
index c82e4ead..1094f639 100644
--- a/test/TEX/bibtex-latex-rerun.py
+++ b/test/TEX/bibtex-latex-rerun.py
@@ -121,3 +121,9 @@ if pdf_output_2 != pdf_output_3:
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/clean.py b/test/TEX/clean.py
index 499cf5b3..d7be478d 100644
--- a/test/TEX/clean.py
+++ b/test/TEX/clean.py
@@ -95,3 +95,9 @@ test.must_not_exist('comment.cut')
 test.must_not_exist('foo.out')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/configure.py b/test/TEX/configure.py
index 23e317c4..0ac261ca 100644
--- a/test/TEX/configure.py
+++ b/test/TEX/configure.py
@@ -86,3 +86,9 @@ test.checkLogAndStdout(["Checking for lmodern..."],
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/dryrun.py b/test/TEX/dryrun.py
index cf7f9baf..bf1088f6 100644
--- a/test/TEX/dryrun.py
+++ b/test/TEX/dryrun.py
@@ -63,3 +63,9 @@ cd . && latex -interaction=nonstopmode foo.ltx ...
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/eps_graphics.py b/test/TEX/eps_graphics.py
index a0278f96..24832a88 100644
--- a/test/TEX/eps_graphics.py
+++ b/test/TEX/eps_graphics.py
@@ -185,3 +185,9 @@ for f in files:
 test.must_not_exist(['docs/Fig1.pdf',])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/makeindex.py b/test/TEX/makeindex.py
index a41c9a7c..038c3f66 100644
--- a/test/TEX/makeindex.py
+++ b/test/TEX/makeindex.py
@@ -103,3 +103,9 @@ test.must_not_exist(test.workpath('simple.ind'))
 test.must_not_exist(test.workpath('no_index.aux'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/multi-run.py b/test/TEX/multi-run.py
index acca069a..439699e3 100644
--- a/test/TEX/multi-run.py
+++ b/test/TEX/multi-run.py
@@ -217,3 +217,9 @@ env.DVI( "foo.ltx" )
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/multiple_include.py b/test/TEX/multiple_include.py
index acace43d..76225cad 100644
--- a/test/TEX/multiple_include.py
+++ b/test/TEX/multiple_include.py
@@ -230,3 +230,9 @@ for f in files:
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/multiple_include_subdir.py b/test/TEX/multiple_include_subdir.py
index 8f614654..ca6190dc 100644
--- a/test/TEX/multiple_include_subdir.py
+++ b/test/TEX/multiple_include_subdir.py
@@ -230,3 +230,9 @@ for f in files:
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/rename_result.py b/test/TEX/rename_result.py
index 11b4ccf2..678d6da8 100644
--- a/test/TEX/rename_result.py
+++ b/test/TEX/rename_result.py
@@ -74,3 +74,9 @@ test.must_exist('bar.xyz')
 test.must_not_exist('bar.pdf')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/subdir-input.py b/test/TEX/subdir-input.py
index a0bb7ee3..98fb942f 100644
--- a/test/TEX/subdir-input.py
+++ b/test/TEX/subdir-input.py
@@ -88,3 +88,9 @@ Sub-document 2
 test.not_up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/subdir_variantdir_input.py b/test/TEX/subdir_variantdir_input.py
index b6633594..77a9d8cd 100644
--- a/test/TEX/subdir_variantdir_input.py
+++ b/test/TEX/subdir_variantdir_input.py
@@ -127,3 +127,9 @@ test.not_up_to_date(arguments = '.')
 #test.up_to_date(arguments = '.', stderr=None, stdout=None)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/usepackage.py b/test/TEX/usepackage.py
index e23a8fcb..136864c8 100644
--- a/test/TEX/usepackage.py
+++ b/test/TEX/usepackage.py
@@ -70,3 +70,9 @@ test.not_up_to_date(arguments = 'foo.dvi', stderr = None)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/variant_dir.py b/test/TEX/variant_dir.py
index 084fb2b0..2fcb96a3 100644
--- a/test/TEX/variant_dir.py
+++ b/test/TEX/variant_dir.py
@@ -259,3 +259,9 @@ for f in files:
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/variant_dir_dup0.py b/test/TEX/variant_dir_dup0.py
index b03e89cf..0d4f4a93 100644
--- a/test/TEX/variant_dir_dup0.py
+++ b/test/TEX/variant_dir_dup0.py
@@ -328,3 +328,9 @@ for f in files:
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ToolSurrogate.py b/test/ToolSurrogate.py
index dd5ea06b..82e0371f 100644
--- a/test/ToolSurrogate.py
+++ b/test/ToolSurrogate.py
@@ -103,3 +103,9 @@ link /nologo /OUT:foo.exe foo.obj
 """))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Touch.py b/test/Touch.py
index fc7c3f88..bf85dcb7 100644
--- a/test/Touch.py
+++ b/test/Touch.py
@@ -127,3 +127,9 @@ test.must_exist(test.workpath('f7.out-Touch'))
 test.must_exist(test.workpath('f8'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Value.py b/test/Value.py
index ea6e682c..f4ed2195 100644
--- a/test/Value.py
+++ b/test/Value.py
@@ -142,3 +142,9 @@ for source_signature in ['MD5', 'timestamp-newer']:
     test.must_match('f5.out', "C=/var")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/BoolVariable.py b/test/Variables/BoolVariable.py
index 2ebe7072..3630fc89 100644
--- a/test/Variables/BoolVariable.py
+++ b/test/Variables/BoolVariable.py
@@ -88,3 +88,9 @@ test.run(arguments='warnings=irgendwas', stderr = expect_stderr, status=2)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/EnumVariable.py b/test/Variables/EnumVariable.py
index 4d09587a..241a9b93 100644
--- a/test/Variables/EnumVariable.py
+++ b/test/Variables/EnumVariable.py
@@ -103,3 +103,9 @@ test.run(arguments='some=IrGeNdwas', stderr=expect_stderr, status=2)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/ListVariable.py b/test/Variables/ListVariable.py
index 8c6c777b..2dc7d4bf 100644
--- a/test/Variables/ListVariable.py
+++ b/test/Variables/ListVariable.py
@@ -174,3 +174,9 @@ scons: Nothing to be done for `dummy'.
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/PackageVariable.py b/test/Variables/PackageVariable.py
index 43384498..d6260556 100644
--- a/test/Variables/PackageVariable.py
+++ b/test/Variables/PackageVariable.py
@@ -91,3 +91,9 @@ test.run(arguments='x11=/non/existing/path/', stderr=expect_stderr, status=2)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/PathVariable.py b/test/Variables/PathVariable.py
index 96da82f1..447d3699 100644
--- a/test/Variables/PathVariable.py
+++ b/test/Variables/PathVariable.py
@@ -286,3 +286,9 @@ test.must_exist(non_existing_subdir)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/Variables.py b/test/Variables/Variables.py
index 8f32f61c..eaac22dd 100644
--- a/test/Variables/Variables.py
+++ b/test/Variables/Variables.py
@@ -362,3 +362,9 @@ env2 = Environment(variables = SCons.Variables.Variables())
 test.run()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/chdir.py b/test/Variables/chdir.py
index 87e9657c..711957c3 100644
--- a/test/Variables/chdir.py
+++ b/test/Variables/chdir.py
@@ -68,3 +68,9 @@ VARIABLE = 'opts2.cfg value'
 test.run(arguments = '-q -Q .', stdout=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/help.py b/test/Variables/help.py
index acfdbd67..0a0a9691 100644
--- a/test/Variables/help.py
+++ b/test/Variables/help.py
@@ -148,3 +148,9 @@ Use scons -H for help about command-line options.
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Variables/import.py b/test/Variables/import.py
index 182ed263..7cdd2741 100644
--- a/test/Variables/import.py
+++ b/test/Variables/import.py
@@ -66,3 +66,9 @@ expect = "VARIABLE = bin/local_options.py\n"
 test.run(arguments = '-q -Q .', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/CPPPATH-subdir.py b/test/VariantDir/CPPPATH-subdir.py
index 25ebb401..2f410944 100644
--- a/test/VariantDir/CPPPATH-subdir.py
+++ b/test/VariantDir/CPPPATH-subdir.py
@@ -69,3 +69,9 @@ test.run(arguments = '.',
          match = TestSCons.match_re_dotall)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/Clean.py b/test/VariantDir/Clean.py
index 3f065e5d..d1e0bb84 100644
--- a/test/VariantDir/Clean.py
+++ b/test/VariantDir/Clean.py
@@ -69,3 +69,9 @@ test.must_not_exist(['build', 'sample.out'])
 test.must_not_exist(['build', 'sample.junk'])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/File-create.py b/test/VariantDir/File-create.py
index ea4e61b9..725404ce 100644
--- a/test/VariantDir/File-create.py
+++ b/test/VariantDir/File-create.py
@@ -68,3 +68,9 @@ test.must_match(['build1', 'f2.out'], "f2.in\n")
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/SConscript-variant_dir.py b/test/VariantDir/SConscript-variant_dir.py
index cba6c2fc..088ead21 100644
--- a/test/VariantDir/SConscript-variant_dir.py
+++ b/test/VariantDir/SConscript-variant_dir.py
@@ -270,3 +270,9 @@ test.run(chdir='test3')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/VariantDir.py b/test/VariantDir/VariantDir.py
index 813bb2f1..f2c0a7c9 100644
--- a/test/VariantDir/VariantDir.py
+++ b/test/VariantDir/VariantDir.py
@@ -404,3 +404,9 @@ non_existing.h:
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/errors.py b/test/VariantDir/errors.py
index 80f47d53..f31cd71c 100644
--- a/test/VariantDir/errors.py
+++ b/test/VariantDir/errors.py
@@ -171,3 +171,9 @@ test.run(chdir = 'duplicate',
          stderr = expect_stderr)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/guess-subdir.py b/test/VariantDir/guess-subdir.py
index 672e1570..294253bb 100644
--- a/test/VariantDir/guess-subdir.py
+++ b/test/VariantDir/guess-subdir.py
@@ -67,3 +67,9 @@ test.must_exist(test.workpath('debug', 'src', 'test.obj'))
 test.must_exist(test.workpath('debug', 'src', 'test.exe'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/include-subdir.py b/test/VariantDir/include-subdir.py
index 7623b925..5ddd623a 100644
--- a/test/VariantDir/include-subdir.py
+++ b/test/VariantDir/include-subdir.py
@@ -74,3 +74,9 @@ env.Program('bin/main', o)
 test.run(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/nested-sconscripts.py b/test/VariantDir/nested-sconscripts.py
index c1d1557b..8782e415 100644
--- a/test/VariantDir/nested-sconscripts.py
+++ b/test/VariantDir/nested-sconscripts.py
@@ -62,3 +62,9 @@ test.write(['src', 'md', 'test', 'SConscript'], """\
 test.run(chdir='src')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/no-execute.py b/test/VariantDir/no-execute.py
index 2006b31b..94bd5cbe 100644
--- a/test/VariantDir/no-execute.py
+++ b/test/VariantDir/no-execute.py
@@ -65,3 +65,9 @@ Copy("%s", "%s")
 test.run(arguments = '-Q -n', stdout=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/reflect.py b/test/VariantDir/reflect.py
index d231fa9d..51a1bc8a 100644
--- a/test/VariantDir/reflect.py
+++ b/test/VariantDir/reflect.py
@@ -134,3 +134,9 @@ test.must_not_exist(['dir1', 'dir2', 'dir1', 'dir2', 'foo.h'])
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/removed-files.py b/test/VariantDir/removed-files.py
index 9f167405..113f6676 100644
--- a/test/VariantDir/removed-files.py
+++ b/test/VariantDir/removed-files.py
@@ -97,3 +97,9 @@ test.run(arguments = '.', stderr=None, status=2)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/VariantDir/under.py b/test/VariantDir/under.py
index 355f2b39..2508db58 100644
--- a/test/VariantDir/under.py
+++ b/test/VariantDir/under.py
@@ -92,3 +92,9 @@ test.must_match(['work', 'build4', 'file.out'], "other/file.in\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/WhereIs.py b/test/WhereIs.py
index a2c5b012..7a93af4f 100644
--- a/test/WhereIs.py
+++ b/test/WhereIs.py
@@ -141,3 +141,9 @@ test.run(arguments = ".",
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Win32/bad-drive.py b/test/Win32/bad-drive.py
index 5b473bcf..513f7fa7 100644
--- a/test/Win32/bad-drive.py
+++ b/test/Win32/bad-drive.py
@@ -105,3 +105,9 @@ expect = "scons: *** [ddd.out] Source `%sno_source' not found, needed by target
 test.run(arguments='ddd.out', stderr=expect, status=2)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Win32/default-drive.py b/test/Win32/default-drive.py
index 9c17c196..84e6389f 100644
--- a/test/Win32/default-drive.py
+++ b/test/Win32/default-drive.py
@@ -67,3 +67,9 @@ test.run(chdir = 'src',
 test.must_match(['build', 'file.out'], "src/file.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Win32/mingw.py b/test/Win32/mingw.py
index feb5373a..969ccfbf 100644
--- a/test/Win32/mingw.py
+++ b/test/Win32/mingw.py
@@ -200,3 +200,9 @@ test.run(arguments='test.exe', stderr='.*')
 test.run(program=test.workpath('test.exe'), stdout='test.cpp2\nshared.cpp2\n')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Win32/scons-bat-error.py b/test/Win32/scons-bat-error.py
index d39858b8..d772132a 100644
--- a/test/Win32/scons-bat-error.py
+++ b/test/Win32/scons-bat-error.py
@@ -82,3 +82,9 @@ test.run(program = 'scons.bat', status = 7)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Win32/win32pathmadness.py b/test/Win32/win32pathmadness.py
index df350eb1..875d9598 100644
--- a/test/Win32/win32pathmadness.py
+++ b/test/Win32/win32pathmadness.py
@@ -146,3 +146,8 @@ scons: .* is up to date.
 
 test.pass_test()
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/YACC.py b/test/YACC/YACC.py
index a00d640d..c0a0f347 100644
--- a/test/YACC/YACC.py
+++ b/test/YACC/YACC.py
@@ -86,3 +86,9 @@ test.must_match('ddd.m',        "ddd.yacc\nmyyacc.py\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/YACCCOM.py b/test/YACC/YACCCOM.py
index 1425eb83..14c4f010 100644
--- a/test/YACC/YACCCOM.py
+++ b/test/YACC/YACCCOM.py
@@ -64,3 +64,9 @@ test.must_match('bbb.c', "bbb.yacc\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/YACCCOMSTR.py b/test/YACC/YACCCOMSTR.py
index b2c128d1..f9204401 100644
--- a/test/YACC/YACCCOMSTR.py
+++ b/test/YACC/YACCCOMSTR.py
@@ -69,3 +69,9 @@ test.must_match('bbb.c', "bbb.yacc\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/YACCFLAGS.py b/test/YACC/YACCFLAGS.py
index 39b510aa..e0f5e5ae 100644
--- a/test/YACC/YACCFLAGS.py
+++ b/test/YACC/YACCFLAGS.py
@@ -82,3 +82,9 @@ test.must_match(['out', 'aaa.c'],	"aaa.y\n -x\n out in\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/YACCHFILESUFFIX.py b/test/YACC/YACCHFILESUFFIX.py
index 231472df..ee554b6b 100644
--- a/test/YACC/YACCHFILESUFFIX.py
+++ b/test/YACC/YACCHFILESUFFIX.py
@@ -80,3 +80,9 @@ test.up_to_date(arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/YACCHXXFILESUFFIX.py b/test/YACC/YACCHXXFILESUFFIX.py
index 182f08b6..933fbc50 100644
--- a/test/YACC/YACCHXXFILESUFFIX.py
+++ b/test/YACC/YACCHXXFILESUFFIX.py
@@ -76,3 +76,9 @@ test.up_to_date(arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/YACCVCGFILESUFFIX.py b/test/YACC/YACCVCGFILESUFFIX.py
index b05471a3..655cc443 100644
--- a/test/YACC/YACCVCGFILESUFFIX.py
+++ b/test/YACC/YACCVCGFILESUFFIX.py
@@ -85,3 +85,9 @@ test.up_to_date(arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/YACC/live.py b/test/YACC/live.py
index 88cbafbe..4922c6a7 100644
--- a/test/YACC/live.py
+++ b/test/YACC/live.py
@@ -172,3 +172,9 @@ test.up_to_date(arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ZIP/ZIP.py b/test/ZIP/ZIP.py
index 10f0efd8..fffb493b 100644
--- a/test/ZIP/ZIP.py
+++ b/test/ZIP/ZIP.py
@@ -178,3 +178,9 @@ except ImportError:
         test.fail_test(f4stored_size == f4deflated_size)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ZIP/ZIPCOM.py b/test/ZIP/ZIPCOM.py
index 37af7583..c1f6761c 100644
--- a/test/ZIP/ZIPCOM.py
+++ b/test/ZIP/ZIPCOM.py
@@ -65,3 +65,9 @@ test.must_match('test1.zip', "test1.in\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ZIP/ZIPCOMSTR.py b/test/ZIP/ZIPCOMSTR.py
index 5284d0a0..acc77c71 100644
--- a/test/ZIP/ZIPCOMSTR.py
+++ b/test/ZIP/ZIPCOMSTR.py
@@ -65,3 +65,9 @@ test.must_match('aaa.zip', "aaa.in\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/_CPPINCFLAGS.py b/test/_CPPINCFLAGS.py
index b2f78262..ccf5e792 100644
--- a/test/_CPPINCFLAGS.py
+++ b/test/_CPPINCFLAGS.py
@@ -53,3 +53,9 @@ expect = """\
 test.run(arguments = '-Q -q', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/bad-variables.py b/test/bad-variables.py
index 0618c5eb..11f2be1a 100644
--- a/test/bad-variables.py
+++ b/test/bad-variables.py
@@ -66,3 +66,9 @@ scons: *** Illegal construction variable `foo(bar)'
 test.run(arguments='.', status=2, stderr=expect_stderr)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/builder-wrappers.py b/test/builder-wrappers.py
index d463cce5..55a0f247 100644
--- a/test/builder-wrappers.py
+++ b/test/builder-wrappers.py
@@ -66,3 +66,9 @@ test.must_match('t2-f1.out', "s-f1.in\n")
 test.must_match('t2-f2.wout', "s-f2.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/builderrors.py b/test/builderrors.py
index 88260c05..733b539f 100644
--- a/test/builderrors.py
+++ b/test/builderrors.py
@@ -204,3 +204,9 @@ test.must_not_contain_any_line(test.stderr(), ['Exception', 'Traceback'])
 
 # No tests failed; OK.
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/chained-build.py b/test/chained-build.py
index 6ec9d1cb..c3351e11 100644
--- a/test/chained-build.py
+++ b/test/chained-build.py
@@ -97,3 +97,9 @@ test.run(chdir='w1',
          stdout = test.wrap_stdout('build(["foo.out"], ["foo.mid"])\n'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/chdir.py b/test/chdir.py
index 1a1a2d72..c4d392e3 100644
--- a/test/chdir.py
+++ b/test/chdir.py
@@ -277,3 +277,9 @@ test.must_match(work2_sub_f1_out, "work2/sub/f1.in")
 test.must_match(work2_sub_f2_out, "work2/sub/f2.in")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/compat/all.py b/test/compat/all.py
index ee8f9ef0..ac7a6ea2 100644
--- a/test/compat/all.py
+++ b/test/compat/all.py
@@ -57,3 +57,9 @@ NO
 test.run(arguments = '-Q -q', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/compat/any.py b/test/compat/any.py
index cab191cf..3c038073 100644
--- a/test/compat/any.py
+++ b/test/compat/any.py
@@ -55,3 +55,9 @@ NO
 test.run(arguments = '-Q -q', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/custom-concat.py b/test/custom-concat.py
index 987c12ef..9d0e64bc 100644
--- a/test/custom-concat.py
+++ b/test/custom-concat.py
@@ -52,3 +52,9 @@ expect = test.wrap_stdout(read_str = "mypas1 mypbs1 mypcs1 mypds1\n",
 test.run(arguments = '.', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/dependency-cycle.py b/test/dependency-cycle.py
index 3cfe6975..42c9392c 100644
--- a/test/dependency-cycle.py
+++ b/test/dependency-cycle.py
@@ -62,3 +62,8 @@ test.fail_test(test.stdout() == "")
 test.pass_test()
 
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/diskcheck.py b/test/diskcheck.py
index 7e099c18..adbeea1e 100644
--- a/test/diskcheck.py
+++ b/test/diskcheck.py
@@ -77,3 +77,9 @@ test.must_contain_all_lines(test.stderr(), ["found where directory expected"])
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/duplicate-sources.py b/test/duplicate-sources.py
index 8d517e50..03b56861 100644
--- a/test/duplicate-sources.py
+++ b/test/duplicate-sources.py
@@ -53,3 +53,9 @@ test.must_match('out.txt', "f1.in\nf2.in\nf1.in\n")
 test.up_to_date(options='--debug=explain', arguments='.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/emitter.py b/test/emitter.py
index b76db7c9..78de13e1 100644
--- a/test/emitter.py
+++ b/test/emitter.py
@@ -99,3 +99,9 @@ test.must_exist(test.workpath('src', 'emit.1'))
 test.must_exist(test.workpath('src', 'emit.2'))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/exceptions.py b/test/exceptions.py
index b51c1eac..12a34309 100644
--- a/test/exceptions.py
+++ b/test/exceptions.py
@@ -125,3 +125,9 @@ test.must_contain_all_lines(test.stderr(), expected_stderr_list)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/exitfns.py b/test/exitfns.py
index 742ac9f2..3fc13228 100644
--- a/test/exitfns.py
+++ b/test/exitfns.py
@@ -68,3 +68,9 @@ sys.exitfunc = f
 test.run(arguments='-f SConstruct .', stdout = expected_output)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/expansion.py b/test/expansion.py
index b438ff4a..80c97062 100644
--- a/test/expansion.py
+++ b/test/expansion.py
@@ -113,3 +113,9 @@ test.fail_test(not os.path.exists(test.workpath('sub', 'foo4' + _obj)))
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/explain/alias-order.py b/test/explain/alias-order.py
index 78f96426..3eed275b 100644
--- a/test/explain/alias-order.py
+++ b/test/explain/alias-order.py
@@ -79,3 +79,9 @@ test.run(chdir='src', arguments=args, stdout=expect)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/explain/basic.py b/test/explain/basic.py
index 1888b5d1..93d761b5 100644
--- a/test/explain/basic.py
+++ b/test/explain/basic.py
@@ -422,3 +422,9 @@ test.up_to_date(chdir='src',arguments='.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/explain/function-actions.py b/test/explain/function-actions.py
index 7e6a2d4d..e5f9ba82 100644
--- a/test/explain/function-actions.py
+++ b/test/explain/function-actions.py
@@ -95,3 +95,9 @@ ChangingCopy(["f2.out"], ["f2.in"])
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/explain/get_csig.py b/test/explain/get_csig.py
index 4bf49811..d35a3152 100644
--- a/test/explain/get_csig.py
+++ b/test/explain/get_csig.py
@@ -73,3 +73,9 @@ test.not_up_to_date(arguments=args)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/explain/save-info.py b/test/explain/save-info.py
index f6ff39a2..d2ffc7de 100644
--- a/test/explain/save-info.py
+++ b/test/explain/save-info.py
@@ -206,3 +206,9 @@ file5.k 1 line 4
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/file-names.py b/test/file-names.py
index 6f486c91..b7fd043e 100644
--- a/test/file-names.py
+++ b/test/file-names.py
@@ -91,3 +91,9 @@ for i in range(1, 255):
         test.fail_test(test.read("out" + c) != contents(c))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/gnutools.py b/test/gnutools.py
index bf0cb5a6..ee082e3d 100644
--- a/test/gnutools.py
+++ b/test/gnutools.py
@@ -143,3 +143,9 @@ testObject(test, dll('cpp-only'),       'g++ -shared')
 testObject(test, dll('c-and-cpp'),      'g++ -shared')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/ignore-command.py b/test/ignore-command.py
index 17ab4d04..0b5429a7 100644
--- a/test/ignore-command.py
+++ b/test/ignore-command.py
@@ -81,3 +81,9 @@ test.run(arguments='.', status=2, stderr=None)
 test.must_match('f1.out', "f1.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/implicit-cache/DualTargets.py b/test/implicit-cache/DualTargets.py
index a2afcc5f..f0694b10 100644
--- a/test/implicit-cache/DualTargets.py
+++ b/test/implicit-cache/DualTargets.py
@@ -133,3 +133,9 @@ test.must_not_contain_any_line(test.stdout(), ['Copy'])
 
 # Then only of the targets using --implicit-cache
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/implicit-cache/GetOption.py b/test/implicit-cache/GetOption.py
index 5915cca6..818784a9 100644
--- a/test/implicit-cache/GetOption.py
+++ b/test/implicit-cache/GetOption.py
@@ -51,3 +51,9 @@ test.run(arguments='--implicit-cache')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/implicit-cache/SetOption.py b/test/implicit-cache/SetOption.py
index ee2afa5c..41a7fb6a 100644
--- a/test/implicit-cache/SetOption.py
+++ b/test/implicit-cache/SetOption.py
@@ -68,3 +68,9 @@ test.up_to_date(arguments = '.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/implicit-cache/basic.py b/test/implicit-cache/basic.py
index d682d439..a3a65462 100644
--- a/test/implicit-cache/basic.py
+++ b/test/implicit-cache/basic.py
@@ -336,3 +336,9 @@ test.not_up_to_date(options = "--implicit-deps-changed",
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py b/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py
index 9a018a3d..272be146 100644
--- a/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py
+++ b/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py
@@ -128,3 +128,9 @@ test.must_match('fileQuote.out',    expect_extra % 'fileQuote.out')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/implicit/asynchronous-modification.py b/test/implicit/asynchronous-modification.py
index d10f823c..fac8ef56 100644
--- a/test/implicit/asynchronous-modification.py
+++ b/test/implicit/asynchronous-modification.py
@@ -87,3 +87,9 @@ test.not_up_to_date(arguments = 'two')
 test.up_to_date(arguments = 'seq')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/implicit/changed-node.py b/test/implicit/changed-node.py
index 99a16acd..6321b829 100644
--- a/test/implicit/changed-node.py
+++ b/test/implicit/changed-node.py
@@ -140,3 +140,9 @@ test.pass_test()
 #clean(1)
 #
 #clean(1)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/import.py b/test/import.py
index a0ab0fbf..c617d0b2 100644
--- a/test/import.py
+++ b/test/import.py
@@ -252,3 +252,9 @@ for tool in tools:
 test.fail_test(len(failures))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/long-lines/live.py b/test/long-lines/live.py
index 916740a5..e8b4a388 100644
--- a/test/long-lines/live.py
+++ b/test/long-lines/live.py
@@ -132,3 +132,9 @@ test.must_exist(lib_static_lib)
 test.must_exist(lib_shared_dll)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/long-lines/signature.py b/test/long-lines/signature.py
index cc8f3e28..a8bd0589 100644
--- a/test/long-lines/signature.py
+++ b/test/long-lines/signature.py
@@ -88,3 +88,9 @@ test.must_match('file.out', "file.in\nFILEFLAG=second\nTIMESTAMP=20090208\n")
 test.up_to_date(options='FILEFLAG=second TIMESTAMP=20090209', arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/multiline.py b/test/multiline.py
index 59eba604..18fc9b59 100644
--- a/test/multiline.py
+++ b/test/multiline.py
@@ -66,3 +66,9 @@ test.fail_test(test.read(test.workpath('foo3.out')) != "foo3.in\n")
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/no-arguments.py b/test/no-arguments.py
index 602ef802..46c06fbd 100644
--- a/test/no-arguments.py
+++ b/test/no-arguments.py
@@ -59,3 +59,9 @@ test.fail_test(test.read('aaa.out') != "aaa.in\n")
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/no-global-dependencies.py b/test/no-global-dependencies.py
index eb3e6093..18b674c9 100644
--- a/test/no-global-dependencies.py
+++ b/test/no-global-dependencies.py
@@ -166,3 +166,9 @@ test.must_not_exist('build/dir1/x.cpp')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/no-target.py b/test/no-target.py
index bffacc29..6c910134 100644
--- a/test/no-target.py
+++ b/test/no-target.py
@@ -69,3 +69,9 @@ test.fail_test(test.read(['subdir', 'ccc', 'ccc.out']) != "subdir/ccc/ccc.in\n")
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/nonexistent.py b/test/nonexistent.py
index b130a1a1..0a6947cc 100644
--- a/test/nonexistent.py
+++ b/test/nonexistent.py
@@ -95,3 +95,9 @@ scons: Nothing to be done for `xxx'.
 """))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--.py b/test/option--.py
index f6a16a20..78bb8d22 100644
--- a/test/option--.py
+++ b/test/option--.py
@@ -59,3 +59,8 @@ test.fail_test(not os.path.exists(test.workpath('-f2.out')))
 
 test.pass_test()
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--C.py b/test/option--C.py
index 8ce52a91..fac75486 100644
--- a/test/option--C.py
+++ b/test/option--C.py
@@ -88,3 +88,9 @@ test.run(arguments = '-C %s -C %s .' % (wpath_sub_dir, wpath_sub),
                                    build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--I.py b/test/option--I.py
index b7cc1f42..d65349a0 100644
--- a/test/option--I.py
+++ b/test/option--I.py
@@ -59,3 +59,9 @@ test.run(arguments = '--include-dir=sub2 --include-dir=sub1 .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--Q.py b/test/option--Q.py
index ce9a161b..46a047ec 100644
--- a/test/option--Q.py
+++ b/test/option--Q.py
@@ -66,3 +66,9 @@ test.fail_test(os.path.exists(test.workpath('f1.out')))
 test.fail_test(os.path.exists(test.workpath('f2.out')))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--R.py b/test/option--R.py
index 7208e904..5fecc670 100644
--- a/test/option--R.py
+++ b/test/option--R.py
@@ -38,3 +38,9 @@ test.run(arguments = '--no-builtin-variables .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--S.py b/test/option--S.py
index 719241d4..e95f14f4 100644
--- a/test/option--S.py
+++ b/test/option--S.py
@@ -39,3 +39,9 @@ test.run(arguments = '--stop .', stderr = "Warning:  ignoring --stop option\n")
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--W.py b/test/option--W.py
index 8c4a6167..9f6fbe49 100644
--- a/test/option--W.py
+++ b/test/option--W.py
@@ -44,3 +44,9 @@ test.run(arguments = '--assume-new=foo .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--Y.py b/test/option--Y.py
index 99d69398..69951c0b 100644
--- a/test/option--Y.py
+++ b/test/option--Y.py
@@ -310,3 +310,9 @@ test.up_to_date(chdir = 'work2', options = opts, arguments = '.')
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--duplicate.py b/test/option--duplicate.py
index 6c631b31..642589e5 100644
--- a/test/option--duplicate.py
+++ b/test/option--duplicate.py
@@ -115,3 +115,9 @@ SCons error: `nonsense' is not a valid duplication style.
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--la.py b/test/option--la.py
index af038e42..ce3aed4a 100644
--- a/test/option--la.py
+++ b/test/option--la.py
@@ -35,3 +35,9 @@ test.run(arguments = '--list-actions .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--ld.py b/test/option--ld.py
index ad39d902..2145de59 100644
--- a/test/option--ld.py
+++ b/test/option--ld.py
@@ -35,3 +35,9 @@ test.run(arguments = '--list-derived .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--lw.py b/test/option--lw.py
index 6a8f07af..cafcb57f 100644
--- a/test/option--lw.py
+++ b/test/option--lw.py
@@ -35,3 +35,9 @@ test.run(arguments = '--list-where .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--max-drift.py b/test/option--max-drift.py
index 6d820fe1..87a5ffe5 100644
--- a/test/option--max-drift.py
+++ b/test/option--max-drift.py
@@ -120,3 +120,8 @@ test.fail_test(test.read('foo.out') != 'foo.in\n')
 
 test.pass_test()
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--override.py b/test/option--override.py
index c3459164..42a92ada 100644
--- a/test/option--override.py
+++ b/test/option--override.py
@@ -35,3 +35,9 @@ test.run(arguments = '--override=foo .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--random.py b/test/option--random.py
index eebd34ee..0e5cc668 100644
--- a/test/option--random.py
+++ b/test/option--random.py
@@ -116,3 +116,9 @@ test.run(arguments = '-c --random .')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--wf.py b/test/option--wf.py
index 760a5cda..7e8cfa7f 100644
--- a/test/option--wf.py
+++ b/test/option--wf.py
@@ -35,3 +35,9 @@ test.run(arguments = '--write-filenames=FILE .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option--wuv.py b/test/option--wuv.py
index 34567465..b08567f6 100644
--- a/test/option--wuv.py
+++ b/test/option--wuv.py
@@ -43,3 +43,9 @@ test.run(arguments = '--warn-undefined-variables',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-b.py b/test/option-b.py
index 495e933d..5a1e6452 100644
--- a/test/option-b.py
+++ b/test/option-b.py
@@ -35,3 +35,9 @@ test.run(arguments = '-b .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-c.py b/test/option-c.py
index 323c89dd..6ea4e58a 100644
--- a/test/option-c.py
+++ b/test/option-c.py
@@ -316,3 +316,8 @@ test.must_not_exist(test.workpath('foo.out'))
 test.pass_test()
 
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-f.py b/test/option-f.py
index 8fb585c5..2a238d3a 100644
--- a/test/option-f.py
+++ b/test/option-f.py
@@ -102,3 +102,9 @@ scons: warning: Ignoring missing SConscript 'no_such_file'
 """ + TestSCons.file_expr))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-i.py b/test/option-i.py
index a4ea4ac5..a1b3a98f 100644
--- a/test/option-i.py
+++ b/test/option-i.py
@@ -92,3 +92,9 @@ test.fail_test(test.read('bbb.out') != "succeed.py: bbb.out\n")
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-j.py b/test/option-j.py
index 4a3669bb..316340e5 100644
--- a/test/option-j.py
+++ b/test/option-j.py
@@ -220,3 +220,9 @@ test.fail_test(start2 < finish1)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-k.py b/test/option-k.py
index 4a460a2b..588b3310 100644
--- a/test/option-k.py
+++ b/test/option-k.py
@@ -293,3 +293,9 @@ test.must_exist(['work3', 'ccc.out'])
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-l.py b/test/option-l.py
index 57659e4e..eedb01e7 100644
--- a/test/option-l.py
+++ b/test/option-l.py
@@ -41,3 +41,9 @@ test.run(arguments = '--max-load=1 .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-m.py b/test/option-m.py
index f44f6f3e..319b4f7b 100644
--- a/test/option-m.py
+++ b/test/option-m.py
@@ -35,3 +35,9 @@ test.run(arguments = '-m .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-n.py b/test/option-n.py
index 9f7391e3..6fb80580 100644
--- a/test/option-n.py
+++ b/test/option-n.py
@@ -235,3 +235,9 @@ log2_mtime = os.path.getmtime(test.workpath("configure","config.log"))
 test.fail_test( log1_mtime != log2_mtime )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-o.py b/test/option-o.py
index d73ca516..23f102b8 100644
--- a/test/option-o.py
+++ b/test/option-o.py
@@ -41,3 +41,9 @@ test.run(arguments = '--assume-old=foo .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-p.py b/test/option-p.py
index beb3a2f0..c4c5d753 100644
--- a/test/option-p.py
+++ b/test/option-p.py
@@ -35,3 +35,9 @@ test.run(arguments = '-p .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-r.py b/test/option-r.py
index 42c08c45..0c124d12 100644
--- a/test/option-r.py
+++ b/test/option-r.py
@@ -38,3 +38,9 @@ test.run(arguments = '--no-builtin-rules .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-s.py b/test/option-s.py
index 20f39fb7..c875495c 100644
--- a/test/option-s.py
+++ b/test/option-s.py
@@ -70,3 +70,9 @@ test.fail_test(not os.path.exists(test.workpath('f2.out')))
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-t.py b/test/option-t.py
index 905f7d30..f7ec081e 100644
--- a/test/option-t.py
+++ b/test/option-t.py
@@ -38,3 +38,9 @@ test.run(arguments = '--touch .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-unknown.py b/test/option-unknown.py
index bfe4cd8c..cbda8dd4 100644
--- a/test/option-unknown.py
+++ b/test/option-unknown.py
@@ -45,3 +45,9 @@ SCons error: no such option: --ZizzerZazzerZuzz
          status = 2)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-v.py b/test/option-v.py
index b91e4d9b..5065eda2 100644
--- a/test/option-v.py
+++ b/test/option-v.py
@@ -64,3 +64,9 @@ if not test.match_re(stdout, expect1) and not test.match_re(stdout, expect2):
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/d.py b/test/option/d.py
index 0f8a9a55..055769a9 100644
--- a/test/option/d.py
+++ b/test/option/d.py
@@ -142,3 +142,9 @@ test.run(program = test.workpath('subdir/ddd'), stdout = "subdir/ddd.c\n")
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-count.py b/test/option/debug-count.py
index 11ad66f1..a52e2014 100644
--- a/test/option/debug-count.py
+++ b/test/option/debug-count.py
@@ -94,3 +94,9 @@ test.run(arguments = '--debug=count -h',
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-findlibs.py b/test/option/debug-findlibs.py
index 70fa5b81..ce971998 100644
--- a/test/option/debug-findlibs.py
+++ b/test/option/debug-findlibs.py
@@ -202,3 +202,9 @@ test.run(arguments = "--debug=findlibs foo.xxx",
 test.must_match('foo.xxx', "a.ooo\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-includes.py b/test/option/debug-includes.py
index 1b7d363d..0982a20f 100644
--- a/test/option/debug-includes.py
+++ b/test/option/debug-includes.py
@@ -119,3 +119,9 @@ test.run(arguments = "--debug=includes foo.shlib")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-memoizer.py b/test/option/debug-memoizer.py
index ff511488..f8e4cc3d 100644
--- a/test/option/debug-memoizer.py
+++ b/test/option/debug-memoizer.py
@@ -118,3 +118,9 @@ test.must_match('file.out', "file.in\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-memory.py b/test/option/debug-memory.py
index b130ab9a..08385015 100644
--- a/test/option/debug-memory.py
+++ b/test/option/debug-memory.py
@@ -79,3 +79,9 @@ test.fail_test(re.match(r'Memory after reading SConscript files: +\d+', lines[-2
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-objects.py b/test/option/debug-objects.py
index 1d3829a2..6a919a4e 100644
--- a/test/option/debug-objects.py
+++ b/test/option/debug-objects.py
@@ -56,3 +56,9 @@ test.run(arguments = "--debug=objects")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-pdb.py b/test/option/debug-pdb.py
index bd79d7f7..d4d285c2 100644
--- a/test/option/debug-pdb.py
+++ b/test/option/debug-pdb.py
@@ -36,3 +36,9 @@ test.run(arguments = "--debug=pdb", stdin = "n\ns\nq\n")
 test.must_contain_all_lines(test.stdout(), ["(Pdb)", "SCons"])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-presub.py b/test/option/debug-presub.py
index cdbefbd3..b5038215 100644
--- a/test/option/debug-presub.py
+++ b/test/option/debug-presub.py
@@ -201,3 +201,9 @@ test.must_match('file18.out', "file18.in\n")
 test.must_match('file20.obj', "file20.c\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-stacktrace.py b/test/option/debug-stacktrace.py
index 80915fd0..b29b39d0 100644
--- a/test/option/debug-stacktrace.py
+++ b/test/option/debug-stacktrace.py
@@ -111,3 +111,9 @@ test.must_contain_all_lines(test.stderr(), lines)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-time.py b/test/option/debug-time.py
index 8a975a37..edd3ea5e 100644
--- a/test/option/debug-time.py
+++ b/test/option/debug-time.py
@@ -203,3 +203,9 @@ if command_time != 0.0:
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/environment-overrides.py b/test/option/environment-overrides.py
index 078bfeae..8680e2cb 100644
--- a/test/option/environment-overrides.py
+++ b/test/option/environment-overrides.py
@@ -42,3 +42,9 @@ test.run(arguments = '--environment-overrides .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/h.py b/test/option/h.py
index f9213334..adcec3aa 100644
--- a/test/option/h.py
+++ b/test/option/h.py
@@ -55,3 +55,9 @@ test.run(arguments = '-D -h')
 test.must_contain_all_lines(test.stdout(), ['-h, --help'])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/help-options.py b/test/option/help-options.py
index f33ae524..9a873068 100644
--- a/test/option/help-options.py
+++ b/test/option/help-options.py
@@ -69,3 +69,9 @@ if lowered != sorted:
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/md5-chunksize.py b/test/option/md5-chunksize.py
index 8c294801..43faf933 100644
--- a/test/option/md5-chunksize.py
+++ b/test/option/md5-chunksize.py
@@ -119,3 +119,9 @@ env.Command('test.stat', 'test.big', Action(get_stat))
 
 test2.run(arguments='--md5-chunksize=128', stdout=expected_stdout, stderr='')
 test2.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/no-print-directory.py b/test/option/no-print-directory.py
index bb0abbf6..850a4840 100644
--- a/test/option/no-print-directory.py
+++ b/test/option/no-print-directory.py
@@ -39,3 +39,9 @@ test.run(arguments = '--no-print-directory .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/print-directory.py b/test/option/print-directory.py
index a5d8fcf6..96d9d7be 100644
--- a/test/option/print-directory.py
+++ b/test/option/print-directory.py
@@ -42,3 +42,9 @@ test.run(arguments = '--print-directory .',
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/profile.py b/test/option/profile.py
index aafebda1..ed5bc0aa 100644
--- a/test/option/profile.py
+++ b/test/option/profile.py
@@ -104,3 +104,9 @@ test.fail_test(len(memory_lines) != 1)
  
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/repository.py b/test/option/repository.py
index d30cbec4..a71e71e8 100644
--- a/test/option/repository.py
+++ b/test/option/repository.py
@@ -59,3 +59,9 @@ test.up_to_date(chdir = 'work1', options = opts, arguments = '.')
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/srcdir.py b/test/option/srcdir.py
index b6bcc593..0a92f131 100644
--- a/test/option/srcdir.py
+++ b/test/option/srcdir.py
@@ -59,3 +59,9 @@ test.up_to_date(chdir = 'work1', options = opts, arguments = '.')
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/stack-size.py b/test/option/stack-size.py
index 495f86dd..9458356c 100644
--- a/test/option/stack-size.py
+++ b/test/option/stack-size.py
@@ -355,3 +355,9 @@ else:
     test.must_not_exist(['work2', 'f2.out'])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/taskmastertrace.py b/test/option/taskmastertrace.py
index 23545c1f..28f4574b 100644
--- a/test/option/taskmastertrace.py
+++ b/test/option/taskmastertrace.py
@@ -221,3 +221,9 @@ Taskmaster: No candidate anymore.
 test.must_match('trace.out', expect_trace)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/tree-all.py b/test/option/tree-all.py
index aa929369..0bd17175 100644
--- a/test/option/tree-all.py
+++ b/test/option/tree-all.py
@@ -227,3 +227,9 @@ if string.count(test.stdout(), tree1) != 1:
     test.fail_test()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/tree-derived.py b/test/option/tree-derived.py
index 3ec33d79..8490612f 100644
--- a/test/option/tree-derived.py
+++ b/test/option/tree-derived.py
@@ -139,3 +139,9 @@ test.run(arguments = "--tree=derived foo.xxx",
 test.must_contain_all_lines(test.stdout(), [dtree1])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/tree-lib.py b/test/option/tree-lib.py
index c9293c28..27213449 100644
--- a/test/option/tree-lib.py
+++ b/test/option/tree-lib.py
@@ -80,3 +80,9 @@ test.must_contain_all_lines(test.stdout(), [expect])
 test.up_to_date(arguments = 'foo.h')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/warn-dependency.py b/test/option/warn-dependency.py
index b849bed8..c0562780 100644
--- a/test/option/warn-dependency.py
+++ b/test/option/warn-dependency.py
@@ -71,3 +71,9 @@ test.run(arguments='--warn=no-dependency --warn=all .',
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/warn-duplicate-environment.py b/test/option/warn-duplicate-environment.py
index 90a75067..a1c156bf 100644
--- a/test/option/warn-duplicate-environment.py
+++ b/test/option/warn-duplicate-environment.py
@@ -78,3 +78,9 @@ test.run(arguments='WARN=no-duplicate-environment file1.out',
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/warn-misleading-keywords.py b/test/option/warn-misleading-keywords.py
index f92ccb0f..e8b6358f 100644
--- a/test/option/warn-misleading-keywords.py
+++ b/test/option/warn-misleading-keywords.py
@@ -77,3 +77,9 @@ test.run(arguments='WARN=no-misleading-keywords .',
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/warn-missing-sconscript.py b/test/option/warn-missing-sconscript.py
index f0aab045..9dc5eee9 100644
--- a/test/option/warn-missing-sconscript.py
+++ b/test/option/warn-missing-sconscript.py
@@ -67,3 +67,9 @@ test.run(arguments = 'WARN=no-missing-sconscript .',
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/overrides.py b/test/overrides.py
index ac936d58..d706ab76 100644
--- a/test/overrides.py
+++ b/test/overrides.py
@@ -127,3 +127,9 @@ assert test.read('goodbye.not_exe') == 'this is not a program!'
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/convenience-functions.py b/test/packaging/convenience-functions.py
index 6eae270d..95543839 100644
--- a/test/packaging/convenience-functions.py
+++ b/test/packaging/convenience-functions.py
@@ -74,3 +74,9 @@ expected = test.wrap_stdout(read_str = expect_read, build_str = expect_build)
 test.run(stdout=expected)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/guess-package-name.py b/test/packaging/guess-package-name.py
index 9c912480..9c85b9a0 100644
--- a/test/packaging/guess-package-name.py
+++ b/test/packaging/guess-package-name.py
@@ -103,3 +103,9 @@ test.run(stderr = None)
 test.must_exist( 'libfoo-1.2.3.tar.bz2' )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/ipkg.py b/test/packaging/ipkg.py
index 62ce628e..08889a9b 100644
--- a/test/packaging/ipkg.py
+++ b/test/packaging/ipkg.py
@@ -127,3 +127,9 @@ test.run(arguments='', stderr = None)
 test.must_exist( 'foo_0.0_arm.ipk' )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/msi/explicit-target.py b/test/packaging/msi/explicit-target.py
index e7b0c2d0..bc786eef 100644
--- a/test/packaging/msi/explicit-target.py
+++ b/test/packaging/msi/explicit-target.py
@@ -89,3 +89,9 @@ test.fail_test( not Package.attributes['Description'].value == 'balalalalal' )
 test.fail_test( not Package.attributes['Comments'].value    == 'this should be reallly really long' )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/msi/file-placement.py b/test/packaging/msi/file-placement.py
index c2aaf356..2cc9e618 100644
--- a/test/packaging/msi/file-placement.py
+++ b/test/packaging/msi/file-placement.py
@@ -170,3 +170,9 @@ componentrefs = features[2].getElementsByTagName( 'ComponentRef' )
 test.fail_test( not componentrefs[0].attributes['Id'].value == 'file3.dll' )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/msi/package.py b/test/packaging/msi/package.py
index 3fb4e6ee..0de241ed 100644
--- a/test/packaging/msi/package.py
+++ b/test/packaging/msi/package.py
@@ -138,3 +138,9 @@ test.fail_test( not elements[4].attributes['Title'].value == 'Java Part' )
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/multiple-packages-at-once.py b/test/packaging/multiple-packages-at-once.py
index bbf273f9..8c3f72de 100644
--- a/test/packaging/multiple-packages-at-once.py
+++ b/test/packaging/multiple-packages-at-once.py
@@ -97,3 +97,9 @@ test.must_exist( 'src-1.0.tar.gz' )
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/multiple-subdirs.py b/test/packaging/multiple-subdirs.py
index 80758abd..66b81a36 100644
--- a/test/packaging/multiple-subdirs.py
+++ b/test/packaging/multiple-subdirs.py
@@ -78,3 +78,9 @@ test.must_exist(['two', 'two-1.0.0.tar.gz'])
 test.must_exist(['three', 'three-1.0.0.tar.gz'])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/option--package-type.py b/test/packaging/option--package-type.py
index ce16e952..c1d6720d 100644
--- a/test/packaging/option--package-type.py
+++ b/test/packaging/option--package-type.py
@@ -86,3 +86,9 @@ test.must_not_exist( 'bin/main.c' )
 test.must_not_exist( '/bin/main.c' )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/place-files-in-subdirectory.py b/test/packaging/place-files-in-subdirectory.py
index 66bdd539..f7224ba8 100644
--- a/test/packaging/place-files-in-subdirectory.py
+++ b/test/packaging/place-files-in-subdirectory.py
@@ -106,3 +106,9 @@ str = os.popen( 'tar -tzf %s'%test.workpath('libfoo-1.2.3.tar.gz') ).read()
 test.fail_test( str != "libfoo-1.2.3/src/main.c\nlibfoo-1.2.3/SConstruct\n" )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/rpm/cleanup.py b/test/packaging/rpm/cleanup.py
index 11f6645c..7ae5473b 100644
--- a/test/packaging/rpm/cleanup.py
+++ b/test/packaging/rpm/cleanup.py
@@ -105,3 +105,9 @@ test.must_not_exist( 'foo-1.2.3/src/main.c' )
 test.must_not_exist( 'bin/main' )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/rpm/explicit-target.py b/test/packaging/rpm/explicit-target.py
index 2949a2fe..c383b574 100644
--- a/test/packaging/rpm/explicit-target.py
+++ b/test/packaging/rpm/explicit-target.py
@@ -86,3 +86,9 @@ scons: *** Setting target is not supported for rpm.
 test.run(arguments='', status=2, stderr=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/rpm/internationalization.py b/test/packaging/rpm/internationalization.py
index 24d8ddd7..e9fcc128 100644
--- a/test/packaging/rpm/internationalization.py
+++ b/test/packaging/rpm/internationalization.py
@@ -179,3 +179,9 @@ test.must_exist( src_rpm )
 test.must_exist( machine_rpm )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/rpm/multipackage.py b/test/packaging/rpm/multipackage.py
index 5b85db31..c3f1f4e2 100644
--- a/test/packaging/rpm/multipackage.py
+++ b/test/packaging/rpm/multipackage.py
@@ -113,3 +113,9 @@ test.fail_test( not os.popen('rpm -qpl %s' % machine_rpm).read()=='/bin/main\n')
 test.fail_test( not os.popen('rpm -qpl %s' % src_rpm).read()=='foo-1.2.3.spec\nfoo-1.2.3.tar.gz\n')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/rpm/package.py b/test/packaging/rpm/package.py
index 2a372658..14da4bb2 100644
--- a/test/packaging/rpm/package.py
+++ b/test/packaging/rpm/package.py
@@ -92,3 +92,9 @@ test.fail_test( not os.popen('rpm -qpl %s' % machine_rpm).read()=='/bin/main\n')
 test.fail_test( not os.popen('rpm -qpl %s' % src_rpm).read()=='foo-1.2.3.spec\nfoo-1.2.3.tar.gz\n')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/rpm/tagging.py b/test/packaging/rpm/tagging.py
index c08b4ef5..6a242c6e 100644
--- a/test/packaging/rpm/tagging.py
+++ b/test/packaging/rpm/tagging.py
@@ -99,3 +99,9 @@ expect = '(0755, root, users) /bin/main'
 test.must_contain_all_lines(test.read('foo-1.2.3.spec'), [expect])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/sandbox-test.py b/test/packaging/sandbox-test.py
index f82940bf..7110c875 100644
--- a/test/packaging/sandbox-test.py
+++ b/test/packaging/sandbox-test.py
@@ -71,3 +71,9 @@ test.must_exist( 'libfoobar-1.2.3.tar.gz' )
 test.must_exist( 'libfoobar-1.2.3.zip' )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/strip-install-dir.py b/test/packaging/strip-install-dir.py
index ec402201..92f0361a 100644
--- a/test/packaging/strip-install-dir.py
+++ b/test/packaging/strip-install-dir.py
@@ -63,3 +63,9 @@ test.must_not_exist( 'bin/main.c' )
 test.must_not_exist( '/bin/main.c' )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/tar/bz2.py b/test/packaging/tar/bz2.py
index 3a12a9be..d37de001 100644
--- a/test/packaging/tar/bz2.py
+++ b/test/packaging/tar/bz2.py
@@ -61,3 +61,9 @@ env.Package( PACKAGETYPE  = 'src_tarbz2',
   test.must_exist( 'src.tar.bz2' )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/tar/gz.py b/test/packaging/tar/gz.py
index 6582ed26..052adc27 100644
--- a/test/packaging/tar/gz.py
+++ b/test/packaging/tar/gz.py
@@ -61,3 +61,9 @@ env.Package( PACKAGETYPE  = 'src_targz',
   test.must_exist( 'src.tar.gz' )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/use-builddir.py b/test/packaging/use-builddir.py
index 4d7e887a..76b97379 100644
--- a/test/packaging/use-builddir.py
+++ b/test/packaging/use-builddir.py
@@ -91,3 +91,9 @@ test.must_exist( 'temp/libfoo-1.2.3/src/main.c' )
 test.must_exist( 'temp/libfoo-1.2.3/SConstruct' )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/packaging/zip.py b/test/packaging/zip.py
index a2406e6f..89f3074e 100644
--- a/test/packaging/zip.py
+++ b/test/packaging/zip.py
@@ -63,3 +63,9 @@ test.run(arguments='', stderr = None)
 test.must_exist( 'src.zip' )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/preserve-source.py b/test/preserve-source.py
index f7abc4cd..cd0b3a37 100644
--- a/test/preserve-source.py
+++ b/test/preserve-source.py
@@ -60,3 +60,9 @@ test.fail_test(not os.path.exists('aaa.in'))
 
 #
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/python-version.py b/test/python-version.py
index 56f65b2b..fbebf8da 100644
--- a/test/python-version.py
+++ b/test/python-version.py
@@ -72,3 +72,9 @@ else:
     test.run(arguments = '-f SetOption-python -Q')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/question/Configure.py b/test/question/Configure.py
index aeaba8ad..88b07843 100644
--- a/test/question/Configure.py
+++ b/test/question/Configure.py
@@ -112,3 +112,9 @@ log2_mtime = os.path.getmtime(test.workpath("config.log"))
 test.fail_test( log1_mtime != log2_mtime )
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/question/basic.py b/test/question/basic.py
index dc07e48f..21e62063 100644
--- a/test/question/basic.py
+++ b/test/question/basic.py
@@ -73,3 +73,9 @@ test.must_match('bbb.out', "bbb.in\n")
 test.run(arguments = '--question bbb.out', status = 0)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/question/no-builder.py b/test/question/no-builder.py
index d0387245..bd1b120e 100644
--- a/test/question/no-builder.py
+++ b/test/question/no-builder.py
@@ -43,3 +43,9 @@ test.run(arguments = '-q no_such_target', status = 1)
 test.run(arguments = '--question no_such_target', status = 1)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/rebuild-generated.py b/test/rebuild-generated.py
index 7f8a6d57..3808845a 100644
--- a/test/rebuild-generated.py
+++ b/test/rebuild-generated.py
@@ -120,3 +120,8 @@ test.run(arguments = 'target' + _obj, stdout=expected_stdout)
 
 test.pass_test()
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/redirection.py b/test/redirection.py
index 64756ff3..55ffeaeb 100644
--- a/test/redirection.py
+++ b/test/redirection.py
@@ -66,3 +66,8 @@ test.fail_test(test.read('foo4') != 'bar4\r\n')
 
 test.pass_test()
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/aegis/batch-output.py b/test/runtest/aegis/batch-output.py
index 40202398..bb2aa1ed 100644
--- a/test/runtest/aegis/batch-output.py
+++ b/test/runtest/aegis/batch-output.py
@@ -58,3 +58,9 @@ test_result = [
 test.must_match('aegis.out', expect, mode='r')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/baseline/combined.py b/test/runtest/baseline/combined.py
index f575bc81..bd479087 100644
--- a/test/runtest/baseline/combined.py
+++ b/test/runtest/baseline/combined.py
@@ -85,3 +85,9 @@ expect = r"""qmtest run --output baseline.qmr --format none --result-stream="sco
 test.run(arguments = '-b . test', status = 1, stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/baseline/fail.py b/test/runtest/baseline/fail.py
index 3a509258..bd52a182 100644
--- a/test/runtest/baseline/fail.py
+++ b/test/runtest/baseline/fail.py
@@ -60,3 +60,9 @@ expect = r"""qmtest run --output baseline.qmr --format none --result-stream="sco
 test.run(arguments = '-b . test/fail.py', status = 1, stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/baseline/no_result.py b/test/runtest/baseline/no_result.py
index 9b1782cf..d1c0f759 100644
--- a/test/runtest/baseline/no_result.py
+++ b/test/runtest/baseline/no_result.py
@@ -58,3 +58,9 @@ expect = r"""qmtest run --output baseline.qmr --format none --result-stream="sco
 test.run(arguments = '-b . test/no_result.py', status = 1, stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/baseline/pass.py b/test/runtest/baseline/pass.py
index 1bc6af12..3644052b 100644
--- a/test/runtest/baseline/pass.py
+++ b/test/runtest/baseline/pass.py
@@ -56,3 +56,9 @@ expect = r"""qmtest run --output baseline.qmr --format none --result-stream="sco
 test.run(arguments = '-b . test/pass.py', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/fallback.py b/test/runtest/fallback.py
index 5ef23638..ddabfbf4 100644
--- a/test/runtest/fallback.py
+++ b/test/runtest/fallback.py
@@ -110,3 +110,9 @@ test.run(arguments = string.join(testlist),
          stderr = expect_stderr)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/noqmtest.py b/test/runtest/noqmtest.py
index f2bf6eb9..3980b707 100644
--- a/test/runtest/noqmtest.py
+++ b/test/runtest/noqmtest.py
@@ -100,3 +100,9 @@ test.run(arguments = '--noqmtest %s' % string.join(testlist),
          stderr = expect_stderr)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/print_time.py b/test/runtest/print_time.py
index 0abfe932..38a5bc6f 100644
--- a/test/runtest/print_time.py
+++ b/test/runtest/print_time.py
@@ -94,3 +94,9 @@ expect = r"""qmtest run --output results.qmr --format none --result-stream="scon
 test.run(arguments = '-t test', status = 1, stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/python.py b/test/runtest/python.py
index d26f98e2..1830aa7b 100644
--- a/test/runtest/python.py
+++ b/test/runtest/python.py
@@ -70,3 +70,9 @@ expect = r"""qmtest run --output results.qmr --format none --result-stream="scon
 test.run(arguments = ['-P', mypython, 'test'], stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/simple/combined.py b/test/runtest/simple/combined.py
index 6bee872f..0c9997fd 100644
--- a/test/runtest/simple/combined.py
+++ b/test/runtest/simple/combined.py
@@ -87,3 +87,9 @@ expect = r"""qmtest run --output results.qmr --format none --result-stream="scon
 test.run(arguments = 'test', status = 1, stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/simple/fail.py b/test/runtest/simple/fail.py
index 1e8e7b6e..f060f507 100644
--- a/test/runtest/simple/fail.py
+++ b/test/runtest/simple/fail.py
@@ -62,3 +62,9 @@ expect = r"""qmtest run --output results.qmr --format none --result-stream="scon
 test.run(arguments = 'test/fail.py', status = 1, stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/simple/no_result.py b/test/runtest/simple/no_result.py
index 16499c82..55d6f0e5 100644
--- a/test/runtest/simple/no_result.py
+++ b/test/runtest/simple/no_result.py
@@ -60,3 +60,9 @@ expect = r"""qmtest run --output results.qmr --format none --result-stream="scon
 test.run(arguments = 'test/no_result.py', status = 1, stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/simple/pass.py b/test/runtest/simple/pass.py
index 561665ab..ee7bc740 100644
--- a/test/runtest/simple/pass.py
+++ b/test/runtest/simple/pass.py
@@ -58,3 +58,9 @@ expect = r"""qmtest run --output results.qmr --format none --result-stream="scon
 test.run(arguments = 'test/pass.py', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/src.py b/test/runtest/src.py
index eebdce4d..70d10f0d 100644
--- a/test/runtest/src.py
+++ b/test/runtest/src.py
@@ -74,3 +74,9 @@ expect = r"""qmtest run --output results.qmr --format none --result-stream="scon
 test.run(arguments = 'src', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/testlistfile.py b/test/runtest/testlistfile.py
index 0c9d84c7..a9d2565b 100644
--- a/test/runtest/testlistfile.py
+++ b/test/runtest/testlistfile.py
@@ -74,3 +74,9 @@ expect = """qmtest run --output results.qmr --format none --result-stream="scons
 test.run(arguments = '-f t.txt', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/runtest/xml/output.py b/test/runtest/xml/output.py
index e1c14cf7..52b718a2 100644
--- a/test/runtest/xml/output.py
+++ b/test/runtest/xml/output.py
@@ -189,3 +189,9 @@ if non_matches:
     test.fail_test()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/same-name.py b/test/same-name.py
index 8f71ac7c..8a1c5e87 100644
--- a/test/same-name.py
+++ b/test/same-name.py
@@ -75,3 +75,9 @@ foo.c
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/basic.py b/test/scons-time/func/basic.py
index 66c58539..fe24f998 100644
--- a/test/scons-time/func/basic.py
+++ b/test/scons-time/func/basic.py
@@ -47,3 +47,9 @@ expect = r'\d.\d\d\d prof\.py:1\(_main\)' + '\n'
 test.run(arguments = 'func foo.prof', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/chdir.py b/test/scons-time/func/chdir.py
index 80ec93e2..0ce43404 100644
--- a/test/scons-time/func/chdir.py
+++ b/test/scons-time/func/chdir.py
@@ -62,3 +62,9 @@ test.run(arguments = 'func -C profs foo-*.prof', stdout = expect)
 test.run(arguments = 'func --chdir profs foo-?.prof', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/file.py b/test/scons-time/func/file.py
index 33a9908c..fa9d36ee 100644
--- a/test/scons-time/func/file.py
+++ b/test/scons-time/func/file.py
@@ -99,3 +99,9 @@ test.run(arguments = 'func --file st2.conf --fmt gnuplot', stdout = expect2)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/format-gnuplot.py b/test/scons-time/func/format-gnuplot.py
index 92eb837d..254a754c 100644
--- a/test/scons-time/func/format-gnuplot.py
+++ b/test/scons-time/func/format-gnuplot.py
@@ -80,3 +80,9 @@ test.run(arguments = 'func --format gnuplot --title TITLE', stdout=expect_title)
 test.run(arguments = 'func --format=gnuplot', stdout=expect_notitle)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/function.py b/test/scons-time/func/function.py
index 27bb94d0..c76bb2f2 100644
--- a/test/scons-time/func/function.py
+++ b/test/scons-time/func/function.py
@@ -56,3 +56,9 @@ test.run(arguments = 'func --func f1 foo.prof', stdout = expect1)
 test.run(arguments = 'func --function f3 foo.prof', stdout = expect3)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/glob.py b/test/scons-time/func/glob.py
index 4a629ed2..d3fd960d 100644
--- a/test/scons-time/func/glob.py
+++ b/test/scons-time/func/glob.py
@@ -55,3 +55,9 @@ test.run(arguments = 'func foo-*.prof', stdout = expect)
 test.run(arguments = 'func foo-?.prof', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/help.py b/test/scons-time/func/help.py
index c451b338..61a1a6db 100644
--- a/test/scons-time/func/help.py
+++ b/test/scons-time/func/help.py
@@ -55,3 +55,9 @@ test.run(arguments = 'help func')
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/no-args.py b/test/scons-time/func/no-args.py
index 0767ae6f..4e2df8d1 100644
--- a/test/scons-time/func/no-args.py
+++ b/test/scons-time/func/no-args.py
@@ -41,3 +41,9 @@ scons-time: func: No arguments specified.
 test.run(arguments = 'func', status = 1, stderr = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/prefix.py b/test/scons-time/func/prefix.py
index 53dfea6f..fe3618f7 100644
--- a/test/scons-time/func/prefix.py
+++ b/test/scons-time/func/prefix.py
@@ -63,3 +63,9 @@ test.run(arguments = 'func -p bar', stdout = bar_expect)
 test.run(arguments = 'func --prefix=foo', stdout = foo_expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/func/tail.py b/test/scons-time/func/tail.py
index 816a7a1d..91fa6c80 100644
--- a/test/scons-time/func/tail.py
+++ b/test/scons-time/func/tail.py
@@ -54,3 +54,9 @@ test.run(arguments = 'func -t 3 foo-*.prof', stdout = ''.join(expect[-3:]))
 test.run(arguments = 'func --tail 5 foo-*.prof', stdout = ''.join(expect[-5:]))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/help/all-subcommands.py b/test/scons-time/help/all-subcommands.py
index 52842abe..7de7fc66 100644
--- a/test/scons-time/help/all-subcommands.py
+++ b/test/scons-time/help/all-subcommands.py
@@ -56,3 +56,9 @@ test.run(arguments = 'help')
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/help/options.py b/test/scons-time/help/options.py
index 43f44274..8fd192dc 100644
--- a/test/scons-time/help/options.py
+++ b/test/scons-time/help/options.py
@@ -57,3 +57,9 @@ test.run(arguments = '--help')
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/chdir.py b/test/scons-time/mem/chdir.py
index a97f7568..52dbd2cb 100644
--- a/test/scons-time/mem/chdir.py
+++ b/test/scons-time/mem/chdir.py
@@ -55,3 +55,9 @@ test.run(arguments = 'mem -C logs foo-*.log', stdout = expect)
 test.run(arguments = 'mem --chdir logs foo-?.log', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/file.py b/test/scons-time/mem/file.py
index a1e71812..fb329a07 100644
--- a/test/scons-time/mem/file.py
+++ b/test/scons-time/mem/file.py
@@ -76,3 +76,9 @@ test.run(arguments = 'mem --file st2.conf --fmt gnuplot', stdout = expect2)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/format-gnuplot.py b/test/scons-time/mem/format-gnuplot.py
index a4e0f19f..5f3e9cd7 100644
--- a/test/scons-time/mem/format-gnuplot.py
+++ b/test/scons-time/mem/format-gnuplot.py
@@ -70,3 +70,9 @@ test.run(arguments = 'mem --format gnuplot --title TITLE', stdout=expect_title)
 test.run(arguments = 'mem --format=gnuplot', stdout=expect_notitle)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/glob.py b/test/scons-time/mem/glob.py
index 6f5174fa..04d8b095 100644
--- a/test/scons-time/mem/glob.py
+++ b/test/scons-time/mem/glob.py
@@ -50,3 +50,9 @@ test.run(arguments = 'mem foo-*.log', stdout = expect)
 test.run(arguments = 'mem foo-?.log', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/help.py b/test/scons-time/mem/help.py
index 3adb1213..4ff34fae 100644
--- a/test/scons-time/mem/help.py
+++ b/test/scons-time/mem/help.py
@@ -55,3 +55,9 @@ test.run(arguments = 'help mem')
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/no-args.py b/test/scons-time/mem/no-args.py
index cb47c9bc..0d1380f8 100644
--- a/test/scons-time/mem/no-args.py
+++ b/test/scons-time/mem/no-args.py
@@ -41,3 +41,9 @@ scons-time: mem: No arguments specified.
 test.run(arguments = 'mem', status = 1, stderr = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/prefix.py b/test/scons-time/mem/prefix.py
index 41eb4e40..5e64dad4 100644
--- a/test/scons-time/mem/prefix.py
+++ b/test/scons-time/mem/prefix.py
@@ -60,3 +60,9 @@ test.run(arguments = 'mem -p bar', stdout = bar_expect)
 test.run(arguments = 'mem --prefix=foo', stdout = foo_expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/stage.py b/test/scons-time/mem/stage.py
index 88b21e29..849c71e5 100644
--- a/test/scons-time/mem/stage.py
+++ b/test/scons-time/mem/stage.py
@@ -81,3 +81,9 @@ test.run(arguments = 'mem --fmt gnuplot --stage unknown',
          stderr = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/mem/tail.py b/test/scons-time/mem/tail.py
index e2c7ede1..19f4036d 100644
--- a/test/scons-time/mem/tail.py
+++ b/test/scons-time/mem/tail.py
@@ -53,3 +53,9 @@ test.run(arguments = 'mem -t 3 foo-*.log', stdout = ''.join(expect3))
 test.run(arguments = 'mem --tail 5 foo-*.log', stdout = ''.join(expect5))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/no-args.py b/test/scons-time/no-args.py
index ba98da2e..1ea69010 100644
--- a/test/scons-time/no-args.py
+++ b/test/scons-time/no-args.py
@@ -40,3 +40,9 @@ Type "scons-time help" for usage.
 test.run(arguments = '', status=1, stderr=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/chdir.py b/test/scons-time/obj/chdir.py
index 5e7df89b..5b7fe228 100644
--- a/test/scons-time/obj/chdir.py
+++ b/test/scons-time/obj/chdir.py
@@ -55,3 +55,9 @@ test.run(arguments = 'obj -C logs Environment.Base foo-*.log', stdout = expect)
 test.run(arguments = 'obj --chdir logs Environment.Base foo-?.log', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/file.py b/test/scons-time/obj/file.py
index 3cf8e742..5076d7f3 100644
--- a/test/scons-time/obj/file.py
+++ b/test/scons-time/obj/file.py
@@ -76,3 +76,9 @@ test.run(arguments = 'obj --file st2.conf --fmt gnuplot Node.FS.Base', stdout =
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/format-gnuplot.py b/test/scons-time/obj/format-gnuplot.py
index b47d843a..cdded16d 100644
--- a/test/scons-time/obj/format-gnuplot.py
+++ b/test/scons-time/obj/format-gnuplot.py
@@ -74,3 +74,9 @@ test.run(arguments = 'obj --format=gnuplot Node.Node',
          stdout=expect_notitle)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/glob.py b/test/scons-time/obj/glob.py
index 4af28547..07ccccc3 100644
--- a/test/scons-time/obj/glob.py
+++ b/test/scons-time/obj/glob.py
@@ -50,3 +50,9 @@ test.run(arguments = 'obj Builder.BuilderBase foo-*.log', stdout = expect)
 test.run(arguments = 'obj Builder.BuilderBase foo-?.log', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/help.py b/test/scons-time/obj/help.py
index 0f21f4d2..d4cc1bd0 100644
--- a/test/scons-time/obj/help.py
+++ b/test/scons-time/obj/help.py
@@ -55,3 +55,9 @@ test.run(arguments = 'help obj')
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/no-args.py b/test/scons-time/obj/no-args.py
index a4d3f845..9350b797 100644
--- a/test/scons-time/obj/no-args.py
+++ b/test/scons-time/obj/no-args.py
@@ -40,3 +40,9 @@ scons-time: obj: Must specify an object name.
 test.run(arguments = 'obj', status = 1, stderr = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/no-files.py b/test/scons-time/obj/no-files.py
index cd91cebf..50e5df10 100644
--- a/test/scons-time/obj/no-files.py
+++ b/test/scons-time/obj/no-files.py
@@ -42,3 +42,9 @@ scons-time: obj: No arguments specified.
 test.run(arguments = 'obj fake.object', status = 1, stderr = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/prefix.py b/test/scons-time/obj/prefix.py
index 8005dc44..e669cf28 100644
--- a/test/scons-time/obj/prefix.py
+++ b/test/scons-time/obj/prefix.py
@@ -60,3 +60,9 @@ test.run(arguments = 'obj -p bar Environment.Base', stdout = bar_expect)
 test.run(arguments = 'obj --prefix=foo Environment.Base', stdout = foo_expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/stage.py b/test/scons-time/obj/stage.py
index 5dbd15b9..7361f697 100644
--- a/test/scons-time/obj/stage.py
+++ b/test/scons-time/obj/stage.py
@@ -86,3 +86,9 @@ test.run(arguments = 'obj --fmt gnuplot --stage unknown',
          stderr = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/obj/tail.py b/test/scons-time/obj/tail.py
index 0483d89f..9049c89c 100644
--- a/test/scons-time/obj/tail.py
+++ b/test/scons-time/obj/tail.py
@@ -53,3 +53,9 @@ test.run(arguments = 'obj -t 3 Node.FS foo-*.log', stdout = expect3)
 test.run(arguments = 'obj --tail 5 Node.FS foo-*.log', stdout = expect5)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/aegis.py b/test/scons-time/run/aegis.py
index eebd933f..09c6aadc 100644
--- a/test/scons-time/run/aegis.py
+++ b/test/scons-time/run/aegis.py
@@ -71,3 +71,9 @@ def re_find(content, line):
 test.must_contain_all_lines(content, expect, 'foo-617-2.log', re_find)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/archive/dir.py b/test/scons-time/run/archive/dir.py
index a6c48ec1..590d568e 100644
--- a/test/scons-time/run/archive/dir.py
+++ b/test/scons-time/run/archive/dir.py
@@ -47,3 +47,9 @@ test.must_exist('foo-000-0.log',
                 'foo-000-2.prof')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/archive/tar-gz.py b/test/scons-time/run/archive/tar-gz.py
index ac69e295..af11c338 100644
--- a/test/scons-time/run/archive/tar-gz.py
+++ b/test/scons-time/run/archive/tar-gz.py
@@ -47,3 +47,9 @@ test.must_exist('foo-000-0.log',
                 'foo-000-2.prof')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/archive/tar.py b/test/scons-time/run/archive/tar.py
index 18823d75..a85dacff 100644
--- a/test/scons-time/run/archive/tar.py
+++ b/test/scons-time/run/archive/tar.py
@@ -47,3 +47,9 @@ test.must_exist('foo-000-0.log',
                 'foo-000-2.prof')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/archive/tgz.py b/test/scons-time/run/archive/tgz.py
index f7df9a01..c349e020 100644
--- a/test/scons-time/run/archive/tgz.py
+++ b/test/scons-time/run/archive/tgz.py
@@ -47,3 +47,9 @@ test.must_exist('foo-000-0.log',
                 'foo-000-2.prof')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/archive/zip.py b/test/scons-time/run/archive/zip.py
index b5b122b8..2fad3b85 100644
--- a/test/scons-time/run/archive/zip.py
+++ b/test/scons-time/run/archive/zip.py
@@ -71,3 +71,9 @@ test.must_exist('foo-000-0.log',
                 'foo-000-2.prof')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/config/archive_list.py b/test/scons-time/run/config/archive_list.py
index 8ddde3d0..d393a694 100644
--- a/test/scons-time/run/config/archive_list.py
+++ b/test/scons-time/run/config/archive_list.py
@@ -75,3 +75,9 @@ test.must_exist('bar-000-0.log',
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/config/initial_commands.py b/test/scons-time/run/config/initial_commands.py
index 73328ef3..167ed49f 100644
--- a/test/scons-time/run/config/initial_commands.py
+++ b/test/scons-time/run/config/initial_commands.py
@@ -54,3 +54,9 @@ test.must_exist('foo-000-0.log',
 test.must_exist('INITIAL')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/config/prefix.py b/test/scons-time/run/config/prefix.py
index c04c9e77..5ef673b6 100644
--- a/test/scons-time/run/config/prefix.py
+++ b/test/scons-time/run/config/prefix.py
@@ -50,3 +50,9 @@ test.must_exist('bar-000-0.log',
                 'bar-000-2.prof')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/config/python.py b/test/scons-time/run/config/python.py
index 4aa85b47..6cf965b0 100644
--- a/test/scons-time/run/config/python.py
+++ b/test/scons-time/run/config/python.py
@@ -66,3 +66,9 @@ test.must_match('foo-000-1.log', "my_python.py: %s\n" % prof1)
 test.must_match('foo-000-2.log', "my_python.py: %s\n" % prof2)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/config/scons.py b/test/scons-time/run/config/scons.py
index be34dde2..73f041da 100644
--- a/test/scons-time/run/config/scons.py
+++ b/test/scons-time/run/config/scons.py
@@ -62,3 +62,9 @@ test.must_match('foo-000-1.log', "my_scons.py: %s\n" % prof1)
 test.must_match('foo-000-2.log', "my_scons.py: %s\n" % prof2)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/config/subdir.py b/test/scons-time/run/config/subdir.py
index b4638680..1d7ca8e1 100644
--- a/test/scons-time/run/config/subdir.py
+++ b/test/scons-time/run/config/subdir.py
@@ -63,3 +63,9 @@ def re_find(content, line):
 test.must_contain_all_lines(content, expect, 'foo-000-0.log', re_find)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/config/targets.py b/test/scons-time/run/config/targets.py
index 8d2abd13..482a44dc 100644
--- a/test/scons-time/run/config/targets.py
+++ b/test/scons-time/run/config/targets.py
@@ -84,3 +84,9 @@ SConstruct file directory: .*scons-time-.*%(sep)sfoo
 test.must_match('foo-000-2.log', expect, mode='r')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/help.py b/test/scons-time/run/option/help.py
index 00a4eb73..d7f2b296 100644
--- a/test/scons-time/run/option/help.py
+++ b/test/scons-time/run/option/help.py
@@ -57,3 +57,9 @@ test.run(arguments = 'help run')
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/next-run.py b/test/scons-time/run/option/next-run.py
index 8a239393..7e729cb1 100644
--- a/test/scons-time/run/option/next-run.py
+++ b/test/scons-time/run/option/next-run.py
@@ -97,3 +97,9 @@ test.must_not_exist('foo-003-0.log',
                     'foo-003-2.prof')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/no-args.py b/test/scons-time/run/option/no-args.py
index 520b27df..e01f24bd 100644
--- a/test/scons-time/run/option/no-args.py
+++ b/test/scons-time/run/option/no-args.py
@@ -40,3 +40,9 @@ scons-time: run: No arguments or -f config file specified.
 test.run(arguments = 'run', status = 1, stderr = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/no-exec.py b/test/scons-time/run/option/no-exec.py
index a2eab746..db6757cf 100644
--- a/test/scons-time/run/option/no-exec.py
+++ b/test/scons-time/run/option/no-exec.py
@@ -47,3 +47,9 @@ test.must_not_exist('foo-000-0.log',
                     'foo-000-2.prof')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/number.py b/test/scons-time/run/option/number.py
index ddf2d866..0e87c2d2 100644
--- a/test/scons-time/run/option/number.py
+++ b/test/scons-time/run/option/number.py
@@ -46,3 +46,9 @@ test.must_exist('foo-077-0.log',
                 'foo-077-2.prof')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/outdir.py b/test/scons-time/run/option/outdir.py
index f60eba05..370974b4 100644
--- a/test/scons-time/run/option/outdir.py
+++ b/test/scons-time/run/option/outdir.py
@@ -49,3 +49,9 @@ test.must_exist(['sub', 'foo-000-0.log'],
                 ['sub', 'foo-000-2.prof'])
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/prefix.py b/test/scons-time/run/option/prefix.py
index 6bc96197..df13cd03 100644
--- a/test/scons-time/run/option/prefix.py
+++ b/test/scons-time/run/option/prefix.py
@@ -46,3 +46,9 @@ test.must_exist('bar-000-0.log',
                 'bar-000-2.prof')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/python.py b/test/scons-time/run/option/python.py
index bd12efe2..a28e23fb 100644
--- a/test/scons-time/run/option/python.py
+++ b/test/scons-time/run/option/python.py
@@ -62,3 +62,9 @@ test.must_match('foo-000-1.log', "my_python.py: %s\n" % prof1)
 test.must_match('foo-000-2.log', "my_python.py: %s\n" % prof2)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/quiet.py b/test/scons-time/run/option/quiet.py
index 453829cb..58b5e823 100644
--- a/test/scons-time/run/option/quiet.py
+++ b/test/scons-time/run/option/quiet.py
@@ -80,3 +80,9 @@ test.must_exist('foo-001-0.log',
 test.run(arguments = 'run --quiet foo.tar.gz', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/scons.py b/test/scons-time/run/option/scons.py
index 14ac18d0..0bf883b6 100644
--- a/test/scons-time/run/option/scons.py
+++ b/test/scons-time/run/option/scons.py
@@ -57,3 +57,9 @@ test.must_match('foo-000-1.log', "my_scons.py: %s\n" % prof1)
 test.must_match('foo-000-2.log', "my_scons.py: %s\n" % prof2)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/subdir.py b/test/scons-time/run/option/subdir.py
index eeae750b..ef8bc81e 100644
--- a/test/scons-time/run/option/subdir.py
+++ b/test/scons-time/run/option/subdir.py
@@ -59,3 +59,9 @@ def re_find(content, line):
 test.must_contain_all_lines(content, expect, 'foo-000-0.log', re_find)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/option/verbose.py b/test/scons-time/run/option/verbose.py
index 935e2a96..8b0be4ad 100644
--- a/test/scons-time/run/option/verbose.py
+++ b/test/scons-time/run/option/verbose.py
@@ -145,3 +145,9 @@ test.run(arguments = 'run --verbose foo.tar.gz', stdout = expect % locals())
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/run/subversion.py b/test/scons-time/run/subversion.py
index d2654226..e3152fcc 100644
--- a/test/scons-time/run/subversion.py
+++ b/test/scons-time/run/subversion.py
@@ -72,3 +72,9 @@ def re_find(content, line):
 test.must_contain_all_lines(content, expect, 'foo-617-2.log', re_find)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/chdir.py b/test/scons-time/time/chdir.py
index b2a4d074..ef340a10 100644
--- a/test/scons-time/time/chdir.py
+++ b/test/scons-time/time/chdir.py
@@ -55,3 +55,9 @@ test.run(arguments = 'time -C logs foo-*.log', stdout = expect)
 test.run(arguments = 'time --chdir logs foo-?.log', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/empty.py b/test/scons-time/time/empty.py
index 7542bfcc..d73db79d 100644
--- a/test/scons-time/time/empty.py
+++ b/test/scons-time/time/empty.py
@@ -89,3 +89,9 @@ test.run(arguments = 'time --fmt gnuplot foo-5-0.log',
          stderr = stderr)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/file.py b/test/scons-time/time/file.py
index 96bd035b..4c3271b0 100644
--- a/test/scons-time/time/file.py
+++ b/test/scons-time/time/file.py
@@ -76,3 +76,9 @@ test.run(arguments = 'time --file st2.conf --fmt gnuplot', stdout = expect2)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/format-gnuplot.py b/test/scons-time/time/format-gnuplot.py
index 8a599a48..7b38626f 100644
--- a/test/scons-time/time/format-gnuplot.py
+++ b/test/scons-time/time/format-gnuplot.py
@@ -70,3 +70,9 @@ test.run(arguments = 'time --format gnuplot --title TITLE', stdout=expect_title)
 test.run(arguments = 'time --format=gnuplot', stdout=expect_notitle)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/glob.py b/test/scons-time/time/glob.py
index 5bf2ccd5..d202e612 100644
--- a/test/scons-time/time/glob.py
+++ b/test/scons-time/time/glob.py
@@ -50,3 +50,9 @@ test.run(arguments = 'time foo-*.log', stdout = expect)
 test.run(arguments = 'time foo-?.log', stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/help.py b/test/scons-time/time/help.py
index aec4c6fe..3df60f79 100644
--- a/test/scons-time/time/help.py
+++ b/test/scons-time/time/help.py
@@ -55,3 +55,9 @@ test.run(arguments = 'help time')
 test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/no-args.py b/test/scons-time/time/no-args.py
index 510b1b32..56ed4a1a 100644
--- a/test/scons-time/time/no-args.py
+++ b/test/scons-time/time/no-args.py
@@ -41,3 +41,9 @@ scons-time: mem: No arguments specified.
 test.run(arguments = 'mem', status = 1, stderr = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/no-result.py b/test/scons-time/time/no-result.py
index ca345b2f..baf06d77 100644
--- a/test/scons-time/time/no-result.py
+++ b/test/scons-time/time/no-result.py
@@ -73,3 +73,9 @@ test.run(arguments = 'time --fmt gnuplot foo-5-0.log',
          stderr = stderr)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/prefix.py b/test/scons-time/time/prefix.py
index cf0462ab..d12287d5 100644
--- a/test/scons-time/time/prefix.py
+++ b/test/scons-time/time/prefix.py
@@ -60,3 +60,9 @@ test.run(arguments = 'time -p bar', stdout = bar_expect)
 test.run(arguments = 'time --prefix=foo', stdout = foo_expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/tail.py b/test/scons-time/time/tail.py
index 600bbc8c..372f7852 100644
--- a/test/scons-time/time/tail.py
+++ b/test/scons-time/time/tail.py
@@ -53,3 +53,9 @@ test.run(arguments = 'time -t 3 foo-*.log', stdout = ''.join(expect3))
 test.run(arguments = 'time --tail 5 foo-*.log', stdout = ''.join(expect5))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/time/which.py b/test/scons-time/time/which.py
index 30ce3a62..170ce49d 100644
--- a/test/scons-time/time/which.py
+++ b/test/scons-time/time/which.py
@@ -82,3 +82,9 @@ test.run(arguments = 'time --fmt gnuplot --which unknown',
          stderr = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/scons-time/unknown.py b/test/scons-time/unknown.py
index cee07c4a..7cb3370b 100644
--- a/test/scons-time/unknown.py
+++ b/test/scons-time/unknown.py
@@ -42,3 +42,9 @@ Type "scons-time help" for usage.
 test.run(arguments = 'unknown', status=1, stderr=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/corrupt.py b/test/sconsign/corrupt.py
index c4d007cf..94c4608c 100644
--- a/test/sconsign/corrupt.py
+++ b/test/sconsign/corrupt.py
@@ -97,3 +97,9 @@ test.run(chdir='work2', arguments='.', stderr=stderr, stdout=stdout)
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/ghost-entries.py b/test/sconsign/ghost-entries.py
index 3fdc9c0f..2f8ee73e 100644
--- a/test/sconsign/ghost-entries.py
+++ b/test/sconsign/ghost-entries.py
@@ -109,3 +109,9 @@ Touch("installer.exe")
 test.run(arguments='-Q pass=2', stdout=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/nonwritable.py b/test/sconsign/nonwritable.py
index 9ad679cf..f5717822 100644
--- a/test/sconsign/nonwritable.py
+++ b/test/sconsign/nonwritable.py
@@ -102,3 +102,9 @@ test.run(chdir='work2', arguments='.')
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/script/Configure.py b/test/sconsign/script/Configure.py
index a4cac588..607d01d3 100644
--- a/test/sconsign/script/Configure.py
+++ b/test/sconsign/script/Configure.py
@@ -88,3 +88,9 @@ test.run_sconsign(arguments = ".sconsign",
                   stdout = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/script/SConsignFile.py b/test/sconsign/script/SConsignFile.py
index 89d562ac..2bf1d078 100644
--- a/test/sconsign/script/SConsignFile.py
+++ b/test/sconsign/script/SConsignFile.py
@@ -465,3 +465,9 @@ sconsign: no entry `hello\.obj' in `\.'
 #""" % locals())
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/script/Signatures.py b/test/sconsign/script/Signatures.py
index 0b580554..5a7b5cfd 100644
--- a/test/sconsign/script/Signatures.py
+++ b/test/sconsign/script/Signatures.py
@@ -173,3 +173,9 @@ hello.obj: %(sig_re)s '%(date_re)s' \d+
 """ % locals())
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/script/bad.py b/test/sconsign/script/bad.py
index 3ada44cc..fc21577f 100644
--- a/test/sconsign/script/bad.py
+++ b/test/sconsign/script/bad.py
@@ -59,3 +59,9 @@ test.run_sconsign(arguments = "-f sconsign bad3",
          stderr = "sconsign: ignoring invalid .sconsign file `bad3'\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/script/dblite.py b/test/sconsign/script/dblite.py
index a21ede04..60232de0 100644
--- a/test/sconsign/script/dblite.py
+++ b/test/sconsign/script/dblite.py
@@ -139,3 +139,9 @@ test.run_sconsign(arguments = "%s -r -f dblite my_sconsign.dblite" % common_flag
                   stdout = expect_r)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/sconsign/script/no-SConsignFile.py b/test/sconsign/script/no-SConsignFile.py
index 9b819b9c..89243295 100644
--- a/test/sconsign/script/no-SConsignFile.py
+++ b/test/sconsign/script/no-SConsignFile.py
@@ -297,3 +297,9 @@ hello.obj: %(sig_re)s \d+ \d+
 """ % locals())
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/signature-order.py b/test/signature-order.py
index c97899f2..6d7516cd 100644
--- a/test/signature-order.py
+++ b/test/signature-order.py
@@ -129,3 +129,9 @@ test.run(program = work2_foo, stdout = "content2\n")
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/silent-command.py b/test/silent-command.py
index e370d21c..a5d03d6d 100644
--- a/test/silent-command.py
+++ b/test/silent-command.py
@@ -81,3 +81,9 @@ test.must_match('f6.out', "f6.in\n")
 test.must_match('f7.out', "f7.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/site_scons/basic.py b/test/site_scons/basic.py
index ed2e1d52..18687239 100644
--- a/test/site_scons/basic.py
+++ b/test/site_scons/basic.py
@@ -67,3 +67,9 @@ scons: `.' is up to date.\n""")
 test.pass_test()
 
 # end of file
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/site_scons/no-site-dir.py b/test/site_scons/no-site-dir.py
index 3fc5a6de..d01d4197 100644
--- a/test/site_scons/no-site-dir.py
+++ b/test/site_scons/no-site-dir.py
@@ -85,3 +85,9 @@ test.fail_test(test.stdout() == not_expected)
 test.pass_test()
 
 # end of file
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/site_scons/nonexistent.py b/test/site_scons/nonexistent.py
index 21853046..6617ff21 100644
--- a/test/site_scons/nonexistent.py
+++ b/test/site_scons/nonexistent.py
@@ -45,3 +45,9 @@ test.run(arguments = '-Q --site-dir=whatever .',
 test.pass_test()
 
 # end of file
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/site_scons/override.py b/test/site_scons/override.py
index ebe56a67..ad03eaeb 100644
--- a/test/site_scons/override.py
+++ b/test/site_scons/override.py
@@ -60,3 +60,9 @@ scons: `.' is up to date.\n""")
 test.pass_test()
 
 # end of file
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/site_scons/site-dir.py b/test/site_scons/site-dir.py
index a05817e7..8e82e947 100644
--- a/test/site_scons/site-dir.py
+++ b/test/site_scons/site-dir.py
@@ -71,3 +71,9 @@ scons: `.' is up to date.\n""")
 test.pass_test()
 
 # end of file
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/site_scons/sys-path.py b/test/site_scons/sys-path.py
index 7af45aaa..fda72307 100644
--- a/test/site_scons/sys-path.py
+++ b/test/site_scons/sys-path.py
@@ -63,3 +63,9 @@ scons: `.' is up to date.\n""")
 test.pass_test()
 
 # end of file
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/skip-execution.py b/test/skip-execution.py
index 50cef794..fbb885ac 100644
--- a/test/skip-execution.py
+++ b/test/skip-execution.py
@@ -60,3 +60,9 @@ test.run(arguments = '.')
 test.must_exist('a')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/spaces.py b/test/spaces.py
index 8be6a830..db1ae975 100644
--- a/test/spaces.py
+++ b/test/spaces.py
@@ -61,3 +61,8 @@ test.run(arguments='foo.out')
 
 test.pass_test()
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/special-filenames.py b/test/special-filenames.py
index f41ae268..91bb5171 100644
--- a/test/special-filenames.py
+++ b/test/special-filenames.py
@@ -84,3 +84,9 @@ for fn in file_names:
     test.fail_test(test.read(out_name) != fn + '\n')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/srcchange.py b/test/srcchange.py
index 6cda3dd4..27921a91 100644
--- a/test/srcchange.py
+++ b/test/srcchange.py
@@ -110,3 +110,9 @@ test.must_exist(prog)
 test.run(program=test.workpath(prog), stdout='Revision $REV: 3.3$\n')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/strfunction.py b/test/strfunction.py
index 62240ee4..8587dcbc 100644
--- a/test/strfunction.py
+++ b/test/strfunction.py
@@ -168,3 +168,9 @@ target.out
 test.run(arguments = '.', stdout=expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/subclassing.py b/test/subclassing.py
index 31632a97..655de519 100644
--- a/test/subclassing.py
+++ b/test/subclassing.py
@@ -77,3 +77,9 @@ test.must_match(['install', 'f1.out'], "f1.in\n")
 test.must_match(['install', 'f2.out'], "f2.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/subdir.py b/test/subdir.py
index 991eb233..fa10cff4 100644
--- a/test/subdir.py
+++ b/test/subdir.py
@@ -65,3 +65,9 @@ test.fail_test(test.read(['subdir', 'f4.out']) != "f4.in\n")
 test.up_to_date(arguments = 'subdir')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/subdivide.py b/test/subdivide.py
index 16f2d0ec..2802fc8a 100644
--- a/test/subdivide.py
+++ b/test/subdivide.py
@@ -140,3 +140,9 @@ test.up_to_date(chdir='src', arguments = test.workpath())
 test.up_to_date(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/suffixes.py b/test/suffixes.py
index 5b9a4139..c6ca1d02 100644
--- a/test/suffixes.py
+++ b/test/suffixes.py
@@ -61,3 +61,9 @@ test.must_match('file3.xyz', "file3.in\n")
 test.must_match('file4.123.out', "file4.in\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/symlink/VariantDir.py b/test/symlink/VariantDir.py
index bbde65d3..bda309e0 100644
--- a/test/symlink/VariantDir.py
+++ b/test/symlink/VariantDir.py
@@ -65,3 +65,9 @@ os.symlink('../srcdir/main.c', 'src/main.c')
 test.run(arguments = '.')
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/symlink/dangling-include.py b/test/symlink/dangling-include.py
index 97026d5e..b5ad9496 100644
--- a/test/symlink/dangling-include.py
+++ b/test/symlink/dangling-include.py
@@ -57,3 +57,9 @@ test.run(arguments = '.', status = 2, stderr = expect,
          match=TestSCons.match_re_dotall)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/symlink/dangling-source.py b/test/symlink/dangling-source.py
index 33ad6614..b803a2e0 100644
--- a/test/symlink/dangling-source.py
+++ b/test/symlink/dangling-source.py
@@ -50,3 +50,9 @@ scons: *** [file.out] Source `file.in' not found, needed by target `file.out'.
 test.run(arguments = '.', status = 2, stderr = expect)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/timestamp-fallback.py b/test/timestamp-fallback.py
index 1f544eab..6b100335 100644
--- a/test/timestamp-fallback.py
+++ b/test/timestamp-fallback.py
@@ -109,3 +109,8 @@ scons: `f4.out' is up to date.
 
 test.pass_test()
 
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/tool_args.py b/test/tool_args.py
index 0bd1a11d..692f6a59 100644
--- a/test/tool_args.py
+++ b/test/tool_args.py
@@ -70,3 +70,9 @@ scons: done building targets.
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/toolpath/VariantDir.py b/test/toolpath/VariantDir.py
index 30f126bb..4177550a 100644
--- a/test/toolpath/VariantDir.py
+++ b/test/toolpath/VariantDir.py
@@ -69,3 +69,9 @@ test.must_match(['build', 'src', 'file.out'], "subdir/src/file.in\n")
 test.run()
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/toolpath/basic.py b/test/toolpath/basic.py
index 7c324b0f..e1e6f3c9 100644
--- a/test/toolpath/basic.py
+++ b/test/toolpath/basic.py
@@ -159,3 +159,9 @@ scons: done building targets.
 """)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/up-to-date.py b/test/up-to-date.py
index 41d892e1..d7381bd7 100644
--- a/test/up-to-date.py
+++ b/test/up-to-date.py
@@ -81,3 +81,9 @@ test.run(options = '-j4 f1.out f2.out f3.out f4.out')
 test.must_contain_all_lines(test.stdout(), expected_lines)
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/timings/SCons_Bars.py b/timings/SCons_Bars.py
index c56fb363..820d3ce6 100644
--- a/timings/SCons_Bars.py
+++ b/timings/SCons_Bars.py
@@ -116,3 +116,9 @@ Revision_Bars = Bars(
         2380 : 'The Big Signature Refactoring hits branches/core.',
     },
 )
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/www/gen_sched_table.py b/www/gen_sched_table.py
index e83c5f31..e67f0d74 100755
--- a/www/gen_sched_table.py
+++ b/www/gen_sched_table.py
@@ -42,3 +42,9 @@ for line in f:
 		category = current = type
 	row(date, category, desc)
 print '</table>'
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: