normalize existing emacs/vim mode-lines in python files

Bunch of these were setting C++ or Make modes and icky tabs...

Also, reportedly Emacs can figure out to enable python-mode
automatically.

Change-Id: I50072488fb92cb4d27aa3f74f717a28ae3967543

61 files changed, 135 insertions, 113 deletions

diff --git a/TEMPLATE.SOURCECODE.HEADER b/TEMPLATE.SOURCECODE.HEADER
index 7ba2a9f27453..f842da62054d 100644
--- a/TEMPLATE.SOURCECODE.HEADER
+++ b/TEMPLATE.SOURCECODE.HEADER
@@ -54,6 +54,19 @@ For makefiles:
 ...
 # vim: set noet sw=4 ts=4:
 
+For Python files:
+
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+...
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
+
 For XML / .component:
 
 <?xml version="1.0" encoding="UTF-8"?>
diff --git a/android/mobile-config.py b/android/mobile-config.py
index 704b1e9e747a..77321306d3f8 100755
--- a/android/mobile-config.py
+++ b/android/mobile-config.py
@@ -1,4 +1,6 @@
 #!/usr/bin/python
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
 # This file is part of the LibreOffice project.
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
@@ -112,4 +114,4 @@ if __name__ == '__main__':
 
     tree.write(sys.argv[2], 'UTF-8', True)
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/bin/convwatch.py b/bin/convwatch.py
index dacf0372de65..51a4f55dee6b 100644
--- a/bin/convwatch.py
+++ b/bin/convwatch.py
@@ -452,4 +452,4 @@ if __name__ == "__main__":
         usage()
         sys.exit(1)
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/bin/test-hid-vs-ui.py b/bin/test-hid-vs-ui.py
index bbb46ae11eb1..635a121ad1d1 100755
--- a/bin/test-hid-vs-ui.py
+++ b/bin/test-hid-vs-ui.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -185,4 +185,4 @@ Note: The bot generating this message can be found and improved here:
     else:
         print errors
 
-# vim: set et sw=4 ts=4:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/bin/upload_symbols.py b/bin/upload_symbols.py
index 07f3e3e415f7..72a03b6e56db 100755
--- a/bin/upload_symbols.py
+++ b/bin/upload_symbols.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -50,4 +50,4 @@ def main():
 if __name__ == "__main__":
     main()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py
index b7077e107668..dcd86095b753 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -1,4 +1,4 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -1826,4 +1826,4 @@ def __gotoline__(n):
 
 g_exportedScripts = left, right, goforward, gobackward, run, stop, home, clearscreen, commandline, __translate__
 
-# vim: set noet sw=4 ts=4:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/biblioaccess.py b/pyuno/demo/biblioaccess.py
index bab6ce61116b..0e5d0b4c8071 100644
--- a/pyuno/demo/biblioaccess.py
+++ b/pyuno/demo/biblioaccess.py
@@ -1,4 +1,4 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -50,4 +50,4 @@ def main():
 
 main()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/hello_world_comp.py b/pyuno/demo/hello_world_comp.py
index 73bdc1fc4257..646a124a47b8 100644
--- a/pyuno/demo/hello_world_comp.py
+++ b/pyuno/demo/hello_world_comp.py
@@ -1,4 +1,4 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -57,4 +57,4 @@ g_ImplementationHelper.addImplementation( \
     ("com.sun.star.task.Job",),)                 # list of implemented services
                                                  # (the only service)
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/ooextract.py b/pyuno/demo/ooextract.py
index 477cc8910282..8a364cd4ed62 100644
--- a/pyuno/demo/ooextract.py
+++ b/pyuno/demo/ooextract.py
@@ -1,4 +1,4 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -126,4 +126,4 @@ def usage():
 
 main()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/swriter.py b/pyuno/demo/swriter.py
index 865160a11851..4f3916136c30 100644
--- a/pyuno/demo/swriter.py
+++ b/pyuno/demo/swriter.py
@@ -1,4 +1,4 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -119,4 +119,4 @@ cursor.setPropertyValue( "CharShadowed", False )
 
 text.insertString( cursor, " That's all for now!" , 0 )
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/swritercomp.py b/pyuno/demo/swritercomp.py
index bdebc9f3f94e..3bdd252e4e44 100644
--- a/pyuno/demo/swritercomp.py
+++ b/pyuno/demo/swritercomp.py
@@ -1,4 +1,4 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -125,4 +125,4 @@ g_ImplementationHelper = unohelper.ImplementationHelper()
 g_ImplementationHelper.addImplementation( \
     SWriterComp,"org.openoffice.comp.pyuno.swriter",("org.openoffice.demo.SWriter",),)
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/demo/swritercompclient.py b/pyuno/demo/swritercompclient.py
index 4ac9d937db51..c4d6cdbf6a66 100644
--- a/pyuno/demo/swritercompclient.py
+++ b/pyuno/demo/swritercompclient.py
@@ -1,4 +1,4 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -29,4 +29,4 @@ pyComp = remoteSmgr.createInstanceWithContext( "org.openoffice.demo.SWriter" , r
 
 pyComp.run( (), )
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py
index 1d1b7de22652..ddb9001fc0e6 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -1,4 +1,4 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -162,4 +162,4 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
     def getSupportedServiceNames( self ):
         return g_supportedServices
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
index 29cc6841131c..bccf22d0f8ac 100644
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py
@@ -1,4 +1,4 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -548,4 +548,4 @@ def _uno_extract_printable_stacktrace(trace):
 
     return ''.join(traceback.format_tb(trace))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/source/module/unohelper.py b/pyuno/source/module/unohelper.py
index a55aaa8483fa..e1e7e35b641c 100644
--- a/pyuno/source/module/unohelper.py
+++ b/pyuno/source/module/unohelper.py
@@ -1,4 +1,4 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -294,4 +294,4 @@ class _FactoryHelper_( XSingleComponentFactory, XServiceInfo, Base ):
     def createInstanceWithArgumentsAndContext( self, args, context ):
         return self.clazz( context, *args )
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
index 0b0bb68af5e5..53bd5943e3c0 100644
--- a/pyuno/source/officehelper.py
+++ b/pyuno/source/officehelper.py
@@ -1,3 +1,4 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -82,3 +83,5 @@ def bootstrap():
         raise BootstrapException("Caught exception " + str(e), None)
 
     return xContext
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/scripting/source/pyprov/msgbox.py b/scripting/source/pyprov/msgbox.py
index 3f2be64f4d13..f9c93df174cb 100644
--- a/scripting/source/pyprov/msgbox.py
+++ b/scripting/source/pyprov/msgbox.py
@@ -1,5 +1,4 @@
-# -*- tab-width: 4; indent-tabs-mode: nil -*-
-#
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -238,3 +237,5 @@ if __name__ == '__main__':
     myBox.numberOflines = 2
 
     print(myBox.show("A small message",0,"Dialog title"))
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py
index e4d6a2e965b5..6089d14edefe 100644
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -1,3 +1,4 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -1077,3 +1078,4 @@ g_ImplementationHelper.addImplementation( \
 
 log.debug( "pythonscript finished intializing" )
 
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sfx2/qa/python/check_sidebar.py b/sfx2/qa/python/check_sidebar.py
index 7599e4dbb179..4dd3a5ddd35b 100644
--- a/sfx2/qa/python/check_sidebar.py
+++ b/sfx2/qa/python/check_sidebar.py
@@ -1,4 +1,4 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -169,4 +169,4 @@ class CheckSidebar(unittest.TestCase):
 if __name__ == "__main__":
     unittest.main()
 
-# vim: set noet sw=4 ts=4:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sfx2/qa/python/check_sidebar_registry.py b/sfx2/qa/python/check_sidebar_registry.py
index 9635f27010d6..70b679a80e25 100644
--- a/sfx2/qa/python/check_sidebar_registry.py
+++ b/sfx2/qa/python/check_sidebar_registry.py
@@ -1,4 +1,4 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -89,4 +89,4 @@ class CheckSidebarRegistry(unittest.TestCase):
 if __name__ == "__main__":
     unittest.main()
 
-# vim: set noet sw=4 ts=4:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py
index 2d061027ba03..5216cb0bfcfd 100644
--- a/solenv/qa/python/gbuildtoide.py
+++ b/solenv/qa/python/gbuildtoide.py
@@ -1,3 +1,4 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 '''
   This file is part of the LibreOffice project.
 
@@ -72,4 +73,4 @@ class CheckGbuildToIde(unittest.TestCase):
 if __name__ == "__main__":
     unittest.main()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/qa/python/check_styles.py b/sw/qa/python/check_styles.py
index 8022acd63017..29fddf6433d6 100644
--- a/sw/qa/python/check_styles.py
+++ b/sw/qa/python/check_styles.py
@@ -1,5 +1,5 @@
 #! /usr/bin/env python
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: t -*-
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -243,4 +243,4 @@ class CheckStyle(unittest.TestCase):
 if __name__ == '__main__':
     unittest.main()
 
-# /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/qa/python/check_table.py b/sw/qa/python/check_table.py
index 6ea619a3804b..2b7de595a534 100644
--- a/sw/qa/python/check_table.py
+++ b/sw/qa/python/check_table.py
@@ -577,4 +577,4 @@ class CheckTable(unittest.TestCase):
 if __name__ == '__main__':
     unittest.main()
 
-# /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/calc_tests/about_test.py b/uitest/calc_tests/about_test.py
index 00ba9bca6079..016c486d1f25 100644
--- a/uitest/calc_tests/about_test.py
+++ b/uitest/calc_tests/about_test.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -22,4 +22,4 @@ class AboutDlgTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/calc_tests/create_chart.py b/uitest/calc_tests/create_chart.py
index ec73da7ac150..6ad7b81c9a53 100644
--- a/uitest/calc_tests/create_chart.py
+++ b/uitest/calc_tests/create_chart.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -157,4 +157,4 @@ class CalcChartUIDemo(UITestCase):
         xCalcDoc = self.xUITest.getTopFocusWindow()
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/calc_tests/create_range_name.py b/uitest/calc_tests/create_range_name.py
index 36a0f63ef148..ee398ab6eb95 100644
--- a/uitest/calc_tests/create_range_name.py
+++ b/uitest/calc_tests/create_range_name.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -53,4 +53,4 @@ class CreateRangeNameTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/calc_tests/edit_chart.py b/uitest/calc_tests/edit_chart.py
index b4345032b660..9ed52559a209 100644
--- a/uitest/calc_tests/edit_chart.py
+++ b/uitest/calc_tests/edit_chart.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -72,4 +72,4 @@ class CalcChartEditUIDemo(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/calc_tests/function_wizard.py b/uitest/calc_tests/function_wizard.py
index ec0920d64896..73870711a5dc 100644
--- a/uitest/calc_tests/function_wizard.py
+++ b/uitest/calc_tests/function_wizard.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -26,4 +26,4 @@ class FunctionWizardTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/calc_tests/gridwin.py b/uitest/calc_tests/gridwin.py
index 57a8fbcde7c7..1afbe8142f54 100644
--- a/uitest/calc_tests/gridwin.py
+++ b/uitest/calc_tests/gridwin.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -28,4 +28,4 @@ class GridWinTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/calc_tests/gridwindow.py b/uitest/calc_tests/gridwindow.py
index 46ed88a4e23b..37afacd008e2 100644
--- a/uitest/calc_tests/gridwindow.py
+++ b/uitest/calc_tests/gridwindow.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -40,4 +40,4 @@ class GridWindowTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/calc_tests/tdf96453.py b/uitest/calc_tests/tdf96453.py
index 9092d4354beb..94f047d7eb03 100644
--- a/uitest/calc_tests/tdf96453.py
+++ b/uitest/calc_tests/tdf96453.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -86,4 +86,4 @@ class ConditionalFormatDlgTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/demo_ui/char_dialog.py b/uitest/demo_ui/char_dialog.py
index 1b90476bd489..4c7716315793 100644
--- a/uitest/demo_ui/char_dialog.py
+++ b/uitest/demo_ui/char_dialog.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -33,4 +33,4 @@ class CharDialogText(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/demo_ui/checkbox.py b/uitest/demo_ui/checkbox.py
index b97e7347da10..2138cf6c968f 100644
--- a/uitest/demo_ui/checkbox.py
+++ b/uitest/demo_ui/checkbox.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -25,4 +25,4 @@ class CheckBoxTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/demo_ui/combobox.py b/uitest/demo_ui/combobox.py
index 5e3517562d61..9b677a4a680b 100644
--- a/uitest/demo_ui/combobox.py
+++ b/uitest/demo_ui/combobox.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -28,4 +28,4 @@ class ComboBoxTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/demo_ui/edit.py b/uitest/demo_ui/edit.py
index 8581e896bab4..a40677c5d8ae 100644
--- a/uitest/demo_ui/edit.py
+++ b/uitest/demo_ui/edit.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -29,4 +29,4 @@ class EditTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/demo_ui/gridwin.py b/uitest/demo_ui/gridwin.py
index 26721a1b8eff..ddfb13273bb8 100644
--- a/uitest/demo_ui/gridwin.py
+++ b/uitest/demo_ui/gridwin.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -48,4 +48,4 @@ class GridWinTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/demo_ui/handle_multiple_files.py b/uitest/demo_ui/handle_multiple_files.py
index dd4cba7966dd..a69cf0723fe2 100644
--- a/uitest/demo_ui/handle_multiple_files.py
+++ b/uitest/demo_ui/handle_multiple_files.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -58,4 +58,4 @@ class HandleFiles(UITestCase):
 
         self.assertTrue(frames[0].getTitle().startswith("test2.ods"))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/demo_ui/listbox.py b/uitest/demo_ui/listbox.py
index c7cc4f27fb2a..5c56c1014a23 100644
--- a/uitest/demo_ui/listbox.py
+++ b/uitest/demo_ui/listbox.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -46,4 +46,4 @@ class ListBoxTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/demo_ui/radiobutton.py b/uitest/demo_ui/radiobutton.py
index b3df02c00728..34c6dee6972f 100644
--- a/uitest/demo_ui/radiobutton.py
+++ b/uitest/demo_ui/radiobutton.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -37,5 +37,4 @@ class RadioButtonTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
-
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/demo_ui/spinfield.py b/uitest/demo_ui/spinfield.py
index 1cf8756a2dc4..49952dcb4cfa 100644
--- a/uitest/demo_ui/spinfield.py
+++ b/uitest/demo_ui/spinfield.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -78,4 +78,4 @@ class SpinFieldTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/demo_ui/tabcontrol.py b/uitest/demo_ui/tabcontrol.py
index 600de28cb686..79a2948cb458 100644
--- a/uitest/demo_ui/tabcontrol.py
+++ b/uitest/demo_ui/tabcontrol.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -34,4 +34,4 @@ class TabControlTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/demo_ui/tabdialog.py b/uitest/demo_ui/tabdialog.py
index 141cd93aa30d..217ee8ea1618 100644
--- a/uitest/demo_ui/tabdialog.py
+++ b/uitest/demo_ui/tabdialog.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -43,4 +43,4 @@ class TabDialogTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/demo_ui/treelist.py b/uitest/demo_ui/treelist.py
index 1ea7dc1935ea..91c18ea7d299 100644
--- a/uitest/demo_ui/treelist.py
+++ b/uitest/demo_ui/treelist.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -43,4 +43,4 @@ class TreeListTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/impress_tests/drawinglayer.py b/uitest/impress_tests/drawinglayer.py
index 8426f7e5f650..0c7a2542da6f 100644
--- a/uitest/impress_tests/drawinglayer.py
+++ b/uitest/impress_tests/drawinglayer.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -52,3 +52,5 @@ class ImpressDrawinglayerTest(UITestCase):
         time.sleep(5)
 
         self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/impress_tests/start.py b/uitest/impress_tests/start.py
index b489b7e0fe7a..de7a6ece7247 100644
--- a/uitest/impress_tests/start.py
+++ b/uitest/impress_tests/start.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -77,4 +77,4 @@ class SimpleImpressTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/libreoffice/calc/conditional_format.py b/uitest/libreoffice/calc/conditional_format.py
index adffc297410a..5acd3c168de0 100644
--- a/uitest/libreoffice/calc/conditional_format.py
+++ b/uitest/libreoffice/calc/conditional_format.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,5 +10,4 @@
 def get_conditional_format_from_sheet(sheet):
     return sheet.getPropertyValue("ConditionalFormats")
 
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/libreoffice/calc/document.py b/uitest/libreoffice/calc/document.py
index 356c5ec9954d..eea8d650df9b 100644
--- a/uitest/libreoffice/calc/document.py
+++ b/uitest/libreoffice/calc/document.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,4 +8,4 @@
 def get_sheet_from_doc(document, index):
     return document.getSheets().getByIndex(index)
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/libreoffice/connection.py b/uitest/libreoffice/connection.py
index 7b36479b4190..1b0150bb6f79 100644
--- a/uitest/libreoffice/connection.py
+++ b/uitest/libreoffice/connection.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -162,4 +162,4 @@ class PersistentConnection:
             finally:
                 self.connection = None
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/libreoffice/uno/eventlistener.py b/uitest/libreoffice/uno/eventlistener.py
index 63eb0e60b53c..8338f6f123c5 100644
--- a/uitest/libreoffice/uno/eventlistener.py
+++ b/uitest/libreoffice/uno/eventlistener.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -47,4 +47,4 @@ class EventListener(XDocumentEventListener,unohelper.Base):
     def disposing(event):
         pass
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/libreoffice/uno/propertyvalue.py b/uitest/libreoffice/uno/propertyvalue.py
index b64c49b23072..25f22adabd07 100644
--- a/uitest/libreoffice/uno/propertyvalue.py
+++ b/uitest/libreoffice/uno/propertyvalue.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -35,4 +35,4 @@ def convert_property_values_to_dict(propMap):
 
     return ret
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/math_tests/start.py b/uitest/math_tests/start.py
index 66262072b255..1eae6490b27e 100644
--- a/uitest/math_tests/start.py
+++ b/uitest/math_tests/start.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -86,4 +86,4 @@ class SimpleMathTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/test_main.py b/uitest/test_main.py
index b3aad3cd5180..498e45d24629 100644
--- a/uitest/test_main.py
+++ b/uitest/test_main.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -115,4 +115,4 @@ if __name__ == '__main__':
         sys.exit(1)
     sys.exit(0)
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/uitest/config.py b/uitest/uitest/config.py
index c08c20812524..890d88475b94 100644
--- a/uitest/uitest/config.py
+++ b/uitest/uitest/config.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,4 +9,4 @@ use_sleep = False
 
 DEFAULT_SLEEP = 0.1
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/uitest/debug.py b/uitest/uitest/debug.py
index 8af6d8af9e7a..234559174a35 100644
--- a/uitest/uitest/debug.py
+++ b/uitest/uitest/debug.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -13,4 +13,4 @@ def sleep(seconds):
     if uitest.config.use_sleep:
         time.sleep(seconds)
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/uitest/framework.py b/uitest/uitest/framework.py
index b2f4a32469b0..be58b129bfa5 100644
--- a/uitest/uitest/framework.py
+++ b/uitest/uitest/framework.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -33,4 +33,4 @@ class UITestCase(unittest.TestCase):
         print("Execution time for %s: %.3f" % (self.id(), t))
         self.connection.tearDown()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/uitest/path.py b/uitest/uitest/path.py
index 19eea2aed2c9..488520d6bbae 100644
--- a/uitest/uitest/path.py
+++ b/uitest/uitest/path.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -28,4 +28,4 @@ def get_instdir_url():
     instdir_path = os.environ.get('INSTDIR', os.path.join(get_src_dir_fallback(), 'instdir'))
     return path2url(instdir_path)
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/uitest/test.py b/uitest/uitest/test.py
index 08834251f0f0..4090a6062bc9 100644
--- a/uitest/uitest/test.py
+++ b/uitest/uitest/test.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -138,4 +138,4 @@ class UITest(object):
                 time_ += DEFAULT_SLEEP
                 time.sleep(DEFAULT_SLEEP)
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/uitest/uihelper/calc.py b/uitest/uitest/uihelper/calc.py
index b63f1702873b..29e8ce44df38 100644
--- a/uitest/uitest/uihelper/calc.py
+++ b/uitest/uitest/uihelper/calc.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,4 +12,4 @@ def enter_text_to_cell(gridwin, cell, text):
     gridwin.executeAction("TYPE", mkPropertyValues({"TEXT": text}))
     gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"}))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/uitest/uihelper/common.py b/uitest/uitest/uihelper/common.py
index 2e991400c050..e0314a22c93a 100644
--- a/uitest/uitest/uihelper/common.py
+++ b/uitest/uitest/uihelper/common.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,4 +10,4 @@ from libreoffice.uno.propertyvalue import convert_property_values_to_dict
 def get_state_as_dict(ui_object):
     return convert_property_values_to_dict(ui_object.getState())
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/writer_tests/start.py b/uitest/writer_tests/start.py
index fe4c054f7850..26b75ce0751e 100644
--- a/uitest/writer_tests/start.py
+++ b/uitest/writer_tests/start.py
@@ -1,4 +1,4 @@
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -68,4 +68,4 @@ class SimpleWriterTest(UITestCase):
 
         self.ui_test.close_doc()
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unotest/source/python/org/libreoffice/unotest.py b/unotest/source/python/org/libreoffice/unotest.py
index f364219458ac..0caab5690ba5 100644
--- a/unotest/source/python/org/libreoffice/unotest.py
+++ b/unotest/source/python/org/libreoffice/unotest.py
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -319,4 +319,4 @@ if __name__ == "__main__":
     con.tearDown()
     print("done")
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim: set shiftwidth=4 softtabstop=4 expandtab: