Mon Dec 19 13:12:27 PST 2011

extensions/AllLangResTarget_abp.mk               |    2 +-
 extensions/AllLangResTarget_bib.mk               |    2 +-
 extensions/AllLangResTarget_dbp.mk               |    2 +-
 extensions/AllLangResTarget_pcr.mk               |    2 +-
 extensions/AllLangResTarget_san.mk               |    2 +-
 extensions/AllLangResTarget_upd.mk               |    2 +-
 extensions/AllLangResTarget_updchk.mk            |    2 +-
 extensions/Configuration_updchk.mk               |    2 +-
 extensions/CppunitTest_extensions_test_update.mk |    1 +
 extensions/Executable_nsplugin.mk                |    2 +-
 extensions/Executable_pluginapp.bin.mk           |    2 +-
 extensions/Library_OOoSpotlightImporter.mk       |    2 +-
 extensions/Library_abp.mk                        |    2 +-
 extensions/Library_bib.mk                        |    2 +-
 extensions/Library_dbp.mk                        |    2 +-
 extensions/Library_ldapbe2.mk                    |    2 +-
 extensions/Library_log.mk                        |    2 +-
 extensions/Library_npsoplugin.mk                 |    2 +-
 extensions/Library_oleautobridge.mk              |    2 +-
 extensions/Library_oleautobridge2.mk             |    2 +-
 extensions/Library_pcr.mk                        |    2 +-
 extensions/Library_pl.mk                         |    2 +-
 extensions/Library_res.mk                        |    2 +-
 extensions/Library_scn.mk                        |    3 +--
 extensions/Library_so_activex.mk                 |    2 +-
 extensions/Library_so_activex_x64.mk             |    2 +-
 extensions/Library_updatecheckui.mk              |    2 +-
 extensions/Library_updatefeed.mk                 |    2 +-
 extensions/Library_updchk.mk                     |    2 +-
 extensions/Library_xmx.mk                        |    2 +-
 extensions/Package_bib.mk                        |    2 +-
 extensions/Package_pcr.mk                        |    2 +-
 extensions/WinResTarget_activex.mk               |    3 +++
 extensions/WinResTarget_npsoplugin.mk            |    2 +-
 extensions/Zip_mdibundle.mk                      |    2 +-
 35 files changed, 37 insertions(+), 34 deletions(-)

New commits:
commit 6716631b35c9ceca9bbe3b5c31b9e5ae810b6920
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Dec 19 22:09:48 2011 +0100

    extensions: d'oh, i've pasted C++ emacs modelines in makefiles

diff --git a/extensions/AllLangResTarget_abp.mk b/extensions/AllLangResTarget_abp.mk
index cda588e..7da6d41 100644
--- a/extensions/AllLangResTarget_abp.mk
+++ b/extensions/AllLangResTarget_abp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/AllLangResTarget_bib.mk b/extensions/AllLangResTarget_bib.mk
index bcc5d1e..78b0677 100644
--- a/extensions/AllLangResTarget_bib.mk
+++ b/extensions/AllLangResTarget_bib.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/AllLangResTarget_dbp.mk b/extensions/AllLangResTarget_dbp.mk
index 88cc389..d4d4e30 100644
--- a/extensions/AllLangResTarget_dbp.mk
+++ b/extensions/AllLangResTarget_dbp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/AllLangResTarget_pcr.mk b/extensions/AllLangResTarget_pcr.mk
index d091af1..87ce2c6 100644
--- a/extensions/AllLangResTarget_pcr.mk
+++ b/extensions/AllLangResTarget_pcr.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/AllLangResTarget_san.mk b/extensions/AllLangResTarget_san.mk
index a866cc9..2301f6c 100644
--- a/extensions/AllLangResTarget_san.mk
+++ b/extensions/AllLangResTarget_san.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/AllLangResTarget_upd.mk b/extensions/AllLangResTarget_upd.mk
index 872e49d..7c1190f 100644
--- a/extensions/AllLangResTarget_upd.mk
+++ b/extensions/AllLangResTarget_upd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/AllLangResTarget_updchk.mk b/extensions/AllLangResTarget_updchk.mk
index c3cd02c..8f956a2 100644
--- a/extensions/AllLangResTarget_updchk.mk
+++ b/extensions/AllLangResTarget_updchk.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Configuration_updchk.mk b/extensions/Configuration_updchk.mk
index d6bcc07..1b3cbd3 100644
--- a/extensions/Configuration_updchk.mk
+++ b/extensions/Configuration_updchk.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index 7ada5af..a81b585 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk
index 49b8761..e328a5c 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -79,4 +79,4 @@ $(eval $(call gb_Executable_add_linked_libs,nsplugin,\
 ))
 endif # WNT
 
-# vim: set noet sw=4 ts=4:
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk
index b67d9e3..1c3b4fc 100644
--- a/extensions/Executable_pluginapp.bin.mk
+++ b/extensions/Executable_pluginapp.bin.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_OOoSpotlightImporter.mk b/extensions/Library_OOoSpotlightImporter.mk
index 4a62233..639b381 100644
--- a/extensions/Library_OOoSpotlightImporter.mk
+++ b/extensions/Library_OOoSpotlightImporter.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
index 8460cf8..8e69ebe 100644
--- a/extensions/Library_abp.mk
+++ b/extensions/Library_abp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
index 27d311f..dd09e0b 100644
--- a/extensions/Library_bib.mk
+++ b/extensions/Library_bib.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk
index dc7f55b..0bbe086 100644
--- a/extensions/Library_dbp.mk
+++ b/extensions/Library_dbp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index 87cb3ad..6f67619 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
index fc7c2d3..d12296e 100644
--- a/extensions/Library_log.mk
+++ b/extensions/Library_log.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 954ba86..f542f59 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk
index 807c9e6..106daf8 100644
--- a/extensions/Library_oleautobridge.mk
+++ b/extensions/Library_oleautobridge.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk
index 35db333..012b99a 100644
--- a/extensions/Library_oleautobridge2.mk
+++ b/extensions/Library_oleautobridge2.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk
index 500d256..9b4837a 100644
--- a/extensions/Library_pcr.mk
+++ b/extensions/Library_pcr.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index 8329ac8..6c07b0f 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk
index 322197c..1fc857a 100644
--- a/extensions/Library_res.mk
+++ b/extensions/Library_res.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
index 6a165d5..37184d4 100644
--- a/extensions/Library_scn.mk
+++ b/extensions/Library_scn.mk
@@ -1,5 +1,4 @@
-
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk
index f4d0d2f..292b7e1 100644
--- a/extensions/Library_so_activex.mk
+++ b/extensions/Library_so_activex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index 4317672..dfee1b8 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk
index 8251427..c336738 100644
--- a/extensions/Library_updatecheckui.mk
+++ b/extensions/Library_updatecheckui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_updatefeed.mk b/extensions/Library_updatefeed.mk
index 01374b5..00a42c4 100644
--- a/extensions/Library_updatefeed.mk
+++ b/extensions/Library_updatefeed.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk
index e78f1d0..a16f2a2 100644
--- a/extensions/Library_updchk.mk
+++ b/extensions/Library_updchk.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Library_xmx.mk b/extensions/Library_xmx.mk
index 1d4ccd5..dfef71d 100644
--- a/extensions/Library_xmx.mk
+++ b/extensions/Library_xmx.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Package_bib.mk b/extensions/Package_bib.mk
index 46b9c3c..5b7eb77 100644
--- a/extensions/Package_bib.mk
+++ b/extensions/Package_bib.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Package_pcr.mk b/extensions/Package_pcr.mk
index db0d91e..48f4630 100644
--- a/extensions/Package_pcr.mk
+++ b/extensions/Package_pcr.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk
index 0487bc2..fd7879c 100644
--- a/extensions/WinResTarget_activex.mk
+++ b/extensions/WinResTarget_activex.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
@@ -44,3 +45,5 @@ $(eval $(call gb_WinResTarget_set_defs,activex_res,\
 	$$(DEFS) \
 	-DMISC=$(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/so_activex) \
 ))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk
index bba6917..33926b3 100644
--- a/extensions/WinResTarget_npsoplugin.mk
+++ b/extensions/WinResTarget_npsoplugin.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
diff --git a/extensions/Zip_mdibundle.mk b/extensions/Zip_mdibundle.mk
index b6ebf08..0d1619f 100644
--- a/extensions/Zip_mdibundle.mk
+++ b/extensions/Zip_mdibundle.mk
@@ -1,4 +1,4 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
