diff --git a/ChangeLog b/ChangeLog
index 962f203d1..61d311118 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,8 @@ $Source$
 
 2002-10-22 Robin Johnson  <robbat2@users.sourceforge.net>
     * user_password.php3: From Patch #625703.
-    * Changelog: Added VIM modelines for filetype and folding.
+    * Changelog: Added VIM modelines for filetype, folding and indentation
+    * `find -name '*.php3'`: Added vim modelines for PEAR style indentation
 
 2002-10-22 Marc Delisle  <lem9@users.sourceforge.net>
     * pdf_pages.php3: undefined variable, fix thanks to 
diff --git a/chk_rel.php3 b/chk_rel.php3
index e5cd9cefe..c87d3c0a7 100644
--- a/chk_rel.php3
+++ b/chk_rel.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/config.inc.php3 b/config.inc.php3
index 0a1450828..572160def 100755
--- a/config.inc.php3
+++ b/config.inc.php3
@@ -1,6 +1,6 @@
 <?php
 /* $Id$ */
-
+// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * phpMyAdmin Configuration File
diff --git a/db_create.php3 b/db_create.php3
index ed801d270..41d227cd0 100755
--- a/db_create.php3
+++ b/db_create.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/db_details.php3 b/db_details.php3
index 84fb84185..62343245f 100755
--- a/db_details.php3
+++ b/db_details.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/db_details_common.php3 b/db_details_common.php3
index 541b2cf67..1c04d9bae 100644
--- a/db_details_common.php3
+++ b/db_details_common.php3
@@ -1,6 +1,6 @@
 <?php
 /* $Id$ */
-
+// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Gets some core libraries
diff --git a/db_details_db_info.php3 b/db_details_db_info.php3
index 0c8f56512..5e303cbbe 100644
--- a/db_details_db_info.php3
+++ b/db_details_db_info.php3
@@ -1,6 +1,6 @@
 <?php
 /* $Id$ */
-
+// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Gets the list of the table in the current db and informations about these
diff --git a/db_details_export.php3 b/db_details_export.php3
index e21135b72..8fc8c5b21 100644
--- a/db_details_export.php3
+++ b/db_details_export.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/db_details_importdocsql.php3 b/db_details_importdocsql.php3
index 8a0dfd07e..cf25ccf55 100644
--- a/db_details_importdocsql.php3
+++ b/db_details_importdocsql.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/db_details_links.php3 b/db_details_links.php3
index 6f1ff0a44..1a098b20b 100644
--- a/db_details_links.php3
+++ b/db_details_links.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/db_details_qbe.php3 b/db_details_qbe.php3
index 16f7b7cb0..4cf1348e5 100755
--- a/db_details_qbe.php3
+++ b/db_details_qbe.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
@@ -1106,4 +1107,4 @@ if (!empty($qry_orderby)) {
  * Displays the footer
  */
 require('./footer.inc.php3');
-?>
\ No newline at end of file
+?>
diff --git a/db_details_structure.php3 b/db_details_structure.php3
index 120837cdb..c6f13355e 100644
--- a/db_details_structure.php3
+++ b/db_details_structure.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/db_printview.php3 b/db_printview.php3
index 50d47fe0e..11aa7c6c9 100755
--- a/db_printview.php3
+++ b/db_printview.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/db_search.php3 b/db_search.php3
index bb6cd4545..81c60d8a7 100644
--- a/db_search.php3
+++ b/db_search.php3
@@ -1,6 +1,6 @@
 <?php
 /* $Id$ */
-
+// vim: expandtab sw=4 ts=4 sts=4:
 /**
  * Credits for this script goes to Thomas Chaumeny <chaume92 at aol.com>
  */
diff --git a/db_stats.php3 b/db_stats.php3
index 9d6d508b0..4eb6f83b8 100644
--- a/db_stats.php3
+++ b/db_stats.php3
@@ -1,6 +1,6 @@
 <?php
 /* $Id$ */
-
+// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Gets the variables sent to this script and send headers
diff --git a/footer.inc.php3 b/footer.inc.php3
index 139cb4bc3..5acad815e 100755
--- a/footer.inc.php3
+++ b/footer.inc.php3
@@ -1,6 +1,6 @@
 <?php
 /* $Id$ */
-
+// vim: expandtab sw=4 ts=4 sts=4:
 
 // In this file you may add PHP or HTML statements that will be used to define
 // the footer for phpMyAdmin pages.
diff --git a/header.inc.php3 b/header.inc.php3
index 267f924f2..f9794ee5c 100755
--- a/header.inc.php3
+++ b/header.inc.php3
@@ -1,6 +1,6 @@
 <?php
 /* $Id$ */
-
+// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Gets a core script and starts output buffering work
diff --git a/header_printview.inc.php3 b/header_printview.inc.php3
index 666b5d0db..07756d851 100644
--- a/header_printview.inc.php3
+++ b/header_printview.inc.php3
@@ -1,6 +1,6 @@
 <?php
 /* $Id$ */
-
+// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Gets a core script and starts output buffering work
diff --git a/index.php3 b/index.php3
index cbbd5e15e..8fef385cb 100755
--- a/index.php3
+++ b/index.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/ldi_check.php3 b/ldi_check.php3
index da587f473..a536b229e 100755
--- a/ldi_check.php3
+++ b/ldi_check.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/ldi_table.php3 b/ldi_table.php3
index 8a0d57b28..57e3efc59 100755
--- a/ldi_table.php3
+++ b/ldi_table.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/left.php3 b/left.php3
index 124b3048a..9670aa63c 100755
--- a/left.php3
+++ b/left.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/libraries/auth/config.auth.lib.php3 b/libraries/auth/config.auth.lib.php3
index f19fd22fe..b6d840df6 100644
--- a/libraries/auth/config.auth.lib.php3
+++ b/libraries/auth/config.auth.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 // +--------------------------------------------------------------------------+
 // | Set of functions used to run config authentication (ie no                 |
diff --git a/libraries/auth/cookie.auth.lib.php3 b/libraries/auth/cookie.auth.lib.php3
index bb15691ce..e924ba649 100644
--- a/libraries/auth/cookie.auth.lib.php3
+++ b/libraries/auth/cookie.auth.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 // +--------------------------------------------------------------------------+
 // | Set of functions used to run cookie based authentication.                |
diff --git a/libraries/auth/http.auth.lib.php3 b/libraries/auth/http.auth.lib.php3
index 444c3d286..1ea838dd3 100644
--- a/libraries/auth/http.auth.lib.php3
+++ b/libraries/auth/http.auth.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 // +--------------------------------------------------------------------------+
 // | Set of functions used to run http authentication.                        |
diff --git a/libraries/bookmark.lib.php3 b/libraries/bookmark.lib.php3
index 6643a111b..914d5db4c 100644
--- a/libraries/bookmark.lib.php3
+++ b/libraries/bookmark.lib.php3
@@ -1,6 +1,6 @@
 <?php
 /* $Id$ */
-
+// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Set of functions used with the bookmark feature
diff --git a/libraries/build_dump.lib.php3 b/libraries/build_dump.lib.php3
index 8f28768bd..f78a6e5c7 100644
--- a/libraries/build_dump.lib.php3
+++ b/libraries/build_dump.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/libraries/charset_conversion.lib.php3 b/libraries/charset_conversion.lib.php3
index 10e14fd74..9cf4842d0 100644
--- a/libraries/charset_conversion.lib.php3
+++ b/libraries/charset_conversion.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 08a26f705..c651ed02d 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3
index 63782a498..402c71c8e 100644
--- a/libraries/config_import.lib.php3
+++ b/libraries/config_import.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/libraries/db_config.lib.php3 b/libraries/db_config.lib.php3
index 14a6d88cf..1af860920 100644
--- a/libraries/db_config.lib.php3
+++ b/libraries/db_config.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Database based configuration system
diff --git a/libraries/db_table_exists.lib.php3 b/libraries/db_table_exists.lib.php3
index a68fea8be..530049c58 100755
--- a/libraries/db_table_exists.lib.php3
+++ b/libraries/db_table_exists.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/libraries/defines.lib.php3 b/libraries/defines.lib.php3
index a6c94ed22..6b0fa2106 100644
--- a/libraries/defines.lib.php3
+++ b/libraries/defines.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * DEFINES VARIABLES & CONSTANTS
diff --git a/libraries/defines_php.lib.php3 b/libraries/defines_php.lib.php3
index 01e0b9e52..53aab466d 100644
--- a/libraries/defines_php.lib.php3
+++ b/libraries/defines_php.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * DEFINES VARIABLES & CONSTANTS
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index 15e76f7b3..badb74ca3 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/libraries/fpdf/font/courier.php3 b/libraries/fpdf/font/courier.php3
index 4c009f39b..83b234336 100644
--- a/libraries/fpdf/font/courier.php3
+++ b/libraries/fpdf/font/courier.php3
@@ -1,4 +1,5 @@
 <?php
+// vim: expandtab sw=4 ts=4 sts=4:
 for($i=0;$i<=255;$i++)
 	$fpdf_charwidths['courier'][chr($i)]=600;
 $fpdf_charwidths['courierB']=$fpdf_charwidths['courier'];
diff --git a/libraries/fpdf/font/helvetica.php3 b/libraries/fpdf/font/helvetica.php3
index 8fa7683e7..e45fb3974 100644
--- a/libraries/fpdf/font/helvetica.php3
+++ b/libraries/fpdf/font/helvetica.php3
@@ -1,4 +1,5 @@
 <?php
+// vim: expandtab sw=4 ts=4 sts=4:
 $fpdf_charwidths['helvetica']=array(
 	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
 	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
diff --git a/libraries/fpdf/font/helveticab.php3 b/libraries/fpdf/font/helveticab.php3
index a8473c94d..d3b5e3bd0 100644
--- a/libraries/fpdf/font/helveticab.php3
+++ b/libraries/fpdf/font/helveticab.php3
@@ -1,4 +1,5 @@
 <?php
+// vim: expandtab sw=4 ts=4 sts=4:
 $fpdf_charwidths['helveticaB']=array(
 	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
 	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
diff --git a/libraries/fpdf/font/helveticabi.php3 b/libraries/fpdf/font/helveticabi.php3
index 41379537d..41846685c 100644
--- a/libraries/fpdf/font/helveticabi.php3
+++ b/libraries/fpdf/font/helveticabi.php3
@@ -1,4 +1,5 @@
 <?php
+// vim: expandtab sw=4 ts=4 sts=4:
 $fpdf_charwidths['helveticaBI']=array(
 	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
 	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
diff --git a/libraries/fpdf/font/helveticai.php3 b/libraries/fpdf/font/helveticai.php3
index d5bb6e094..13d5afbce 100644
--- a/libraries/fpdf/font/helveticai.php3
+++ b/libraries/fpdf/font/helveticai.php3
@@ -1,4 +1,5 @@
 <?php
+// vim: expandtab sw=4 ts=4 sts=4:
 $fpdf_charwidths['helveticaI']=array(
 	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
 	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
diff --git a/libraries/fpdf/font/symbol.php3 b/libraries/fpdf/font/symbol.php3
index b556ed84c..80c5684df 100644
--- a/libraries/fpdf/font/symbol.php3
+++ b/libraries/fpdf/font/symbol.php3
@@ -1,4 +1,5 @@
 <?php
+// vim: expandtab sw=4 ts=4 sts=4:
 $fpdf_charwidths['symbol']=array(
 	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
 	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>713,'#'=>500,'$'=>549,'%'=>833,'&'=>778,'\''=>439,'('=>333,')'=>333,'*'=>500,'+'=>549,
diff --git a/libraries/fpdf/font/times.php3 b/libraries/fpdf/font/times.php3
index b9be1b21d..095f674c4 100644
--- a/libraries/fpdf/font/times.php3
+++ b/libraries/fpdf/font/times.php3
@@ -1,4 +1,5 @@
 <?php
+// vim: expandtab sw=4 ts=4 sts=4:
 $fpdf_charwidths['times']=array(
 	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
 	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>408,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>180,'('=>333,')'=>333,'*'=>500,'+'=>564,
diff --git a/libraries/fpdf/font/timesb.php3 b/libraries/fpdf/font/timesb.php3
index c3eb9fa75..b75b611fa 100644
--- a/libraries/fpdf/font/timesb.php3
+++ b/libraries/fpdf/font/timesb.php3
@@ -1,4 +1,5 @@
 <?php
+// vim: expandtab sw=4 ts=4 sts=4:
 $fpdf_charwidths['timesB']=array(
 	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
 	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>555,'#'=>500,'$'=>500,'%'=>1000,'&'=>833,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
diff --git a/libraries/fpdf/font/timesbi.php3 b/libraries/fpdf/font/timesbi.php3
index 161f6302c..ec387dcb0 100644
--- a/libraries/fpdf/font/timesbi.php3
+++ b/libraries/fpdf/font/timesbi.php3
@@ -1,4 +1,5 @@
 <?php
+// vim: expandtab sw=4 ts=4 sts=4:
 $fpdf_charwidths['timesBI']=array(
 	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
 	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>389,'"'=>555,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
diff --git a/libraries/fpdf/font/timesi.php3 b/libraries/fpdf/font/timesi.php3
index de171fd19..d14cfaddf 100644
--- a/libraries/fpdf/font/timesi.php3
+++ b/libraries/fpdf/font/timesi.php3
@@ -1,4 +1,5 @@
 <?php
+// vim: expandtab sw=4 ts=4 sts=4:
 $fpdf_charwidths['timesI']=array(
 	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
 	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>420,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>214,'('=>333,')'=>333,'*'=>500,'+'=>675,
diff --git a/libraries/fpdf/font/zapfdingbats.php3 b/libraries/fpdf/font/zapfdingbats.php3
index f2bdfd5c9..b7fd15310 100644
--- a/libraries/fpdf/font/zapfdingbats.php3
+++ b/libraries/fpdf/font/zapfdingbats.php3
@@ -1,4 +1,5 @@
 <?php
+// vim: expandtab sw=4 ts=4 sts=4:
 $fpdf_charwidths['zapfdingbats']=array(
 	chr(0)=>0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0,
 	chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939,
diff --git a/libraries/fpdf/fpdf.php3 b/libraries/fpdf/fpdf.php3
index 63df37eb4..0d721f6a2 100644
--- a/libraries/fpdf/fpdf.php3
+++ b/libraries/fpdf/fpdf.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 /****************************************************************************
 * Software : FPDF                                                           *
diff --git a/libraries/get_foreign.lib.php3 b/libraries/get_foreign.lib.php3
index 0ce6ddc86..62766d0cd 100755
--- a/libraries/get_foreign.lib.php3
+++ b/libraries/get_foreign.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/libraries/grab_globals.lib.php3 b/libraries/grab_globals.lib.php3
index 5b0f242e0..b653ac22e 100644
--- a/libraries/grab_globals.lib.php3
+++ b/libraries/grab_globals.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/libraries/ip_allow_deny.lib.php3 b/libraries/ip_allow_deny.lib.php3
index 97f1fd841..65077eab2 100644
--- a/libraries/ip_allow_deny.lib.php3
+++ b/libraries/ip_allow_deny.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * This library is used with the server IP allow/deny host authentication
@@ -372,4 +373,4 @@ if (!defined('PMA_ALLOW_DENY_LIB_INCLUDED')) {
     } // end of the "PMA_AllowDeny()" function
 
 } // $__PMA_ALLOW_DENY_LIB__
-?>
\ No newline at end of file
+?>
diff --git a/libraries/kanji-encoding.lib.php3 b/libraries/kanji-encoding.lib.php3
index b1a0ec7b1..e6486bbdc 100644
--- a/libraries/kanji-encoding.lib.php3
+++ b/libraries/kanji-encoding.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/libraries/mysql_wrappers.lib.php3 b/libraries/mysql_wrappers.lib.php3
index d5af8dcbb..f9b2cb760 100644
--- a/libraries/mysql_wrappers.lib.php3
+++ b/libraries/mysql_wrappers.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/libraries/ob.lib.php3 b/libraries/ob.lib.php3
index e89674d25..b2711f0c4 100644
--- a/libraries/ob.lib.php3
+++ b/libraries/ob.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 if (!defined('PMA_OB_LIB_INCLUDED')) {
diff --git a/libraries/relation.lib.php3 b/libraries/relation.lib.php3
index 03a743072..f7bc5c013 100644
--- a/libraries/relation.lib.php3
+++ b/libraries/relation.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Set of functions used with the relation and pdf feature
@@ -313,4 +314,4 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){
          }
      } // end of the 'PMA_getComments()' function
 } // $__PMA_RELATION_LIB__
-?>
\ No newline at end of file
+?>
diff --git a/libraries/select_lang.lib.php3 b/libraries/select_lang.lib.php3
index 2f46b7d66..f4507d589 100644
--- a/libraries/select_lang.lib.php3
+++ b/libraries/select_lang.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/libraries/sqlparser.data.php3 b/libraries/sqlparser.data.php3
index e198c3d20..f9425a145 100644
--- a/libraries/sqlparser.data.php3
+++ b/libraries/sqlparser.data.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /** SQL Parser Matching Data
diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3
index e577a15f8..51a2d22fc 100644
--- a/libraries/sqlparser.lib.php3
+++ b/libraries/sqlparser.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /** SQL Parser Functions for phpMyAdmin
diff --git a/libraries/sqlvalidator.class.php3 b/libraries/sqlvalidator.class.php3
index 9648a684e..d94e1e448 100644
--- a/libraries/sqlvalidator.class.php3
+++ b/libraries/sqlvalidator.class.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/libraries/sqlvalidator.lib.php3 b/libraries/sqlvalidator.lib.php3
index 2f75df41f..9fd3c243a 100644
--- a/libraries/sqlvalidator.lib.php3
+++ b/libraries/sqlvalidator.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/libraries/string.lib.php3 b/libraries/string.lib.php3
index e982ca6b7..a2e57bb78 100644
--- a/libraries/string.lib.php3
+++ b/libraries/string.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /** Specialized String Functions for phpMyAdmin
diff --git a/libraries/zip.lib.php3 b/libraries/zip.lib.php3
index 88395139f..3c8e8248f 100755
--- a/libraries/zip.lib.php3
+++ b/libraries/zip.lib.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/main.php3 b/main.php3
index 47df4674f..bd317a8c0 100755
--- a/main.php3
+++ b/main.php3
@@ -1,5 +1,7 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
 
 
 /**
diff --git a/mult_submits.inc.php3 b/mult_submits.inc.php3
index 8f32efc09..edc576699 100644
--- a/mult_submits.inc.php3
+++ b/mult_submits.inc.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/pdf_pages.php3 b/pdf_pages.php3
index aa0dd457f..ad369e104 100755
--- a/pdf_pages.php3
+++ b/pdf_pages.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/pdf_schema.php3 b/pdf_schema.php3
index c80ed2c50..5ddc2725e 100644
--- a/pdf_schema.php3
+++ b/pdf_schema.php3
@@ -1,5 +1,7 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
 
 /**
  * Contributed by Maxime Delorme and merged by lem9
diff --git a/phpinfo.php3 b/phpinfo.php3
index 4eaf83183..39b2d50eb 100644
--- a/phpinfo.php3
+++ b/phpinfo.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/read_dump.php3 b/read_dump.php3
index fed6eb45e..d4b198442 100644
--- a/read_dump.php3
+++ b/read_dump.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/scripts/check_lang.php3 b/scripts/check_lang.php3
index 5ba080475..0076075e3 100644
--- a/scripts/check_lang.php3
+++ b/scripts/check_lang.php3
@@ -1,5 +1,7 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4 foldmarker={,} fdm=marker:
+
 
 /**
  * This test script checks all the language files to ensure there is no errors
diff --git a/scripts/decode_bug.php3 b/scripts/decode_bug.php3
index 310da9855..1ae0332eb 100644
--- a/scripts/decode_bug.php3
+++ b/scripts/decode_bug.php3
@@ -1,5 +1,7 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4 foldmarker={,} fdm=marker:
+
 
 /**
  * Parser BUG decoder
diff --git a/sql.php3 b/sql.php3
index 6bb9d5443..f5d5af738 100755
--- a/sql.php3
+++ b/sql.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_addfield.php3 b/tbl_addfield.php3
index 0fe6ae1db..3d8c8e7ec 100755
--- a/tbl_addfield.php3
+++ b/tbl_addfield.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_alter.php3 b/tbl_alter.php3
index c2ad8e762..332483e1a 100755
--- a/tbl_alter.php3
+++ b/tbl_alter.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_change.php3 b/tbl_change.php3
index 551a0ebe9..071a6decb 100755
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_create.php3 b/tbl_create.php3
index 9ddcf9927..ecf6aa066 100755
--- a/tbl_create.php3
+++ b/tbl_create.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_dump.php3 b/tbl_dump.php3
index 3a70ae7d8..d504260ac 100755
--- a/tbl_dump.php3
+++ b/tbl_dump.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_indexes.php3 b/tbl_indexes.php3
index acddbf8ea..aa63c706e 100644
--- a/tbl_indexes.php3
+++ b/tbl_indexes.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_move_copy.php3 b/tbl_move_copy.php3
index 4bced9808..6a7173029 100644
--- a/tbl_move_copy.php3
+++ b/tbl_move_copy.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_printview.php3 b/tbl_printview.php3
index ff666c839..777f27b22 100755
--- a/tbl_printview.php3
+++ b/tbl_printview.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_properties.inc.php3 b/tbl_properties.inc.php3
index a22342806..9355fa3b0 100755
--- a/tbl_properties.inc.php3
+++ b/tbl_properties.inc.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 ?>
diff --git a/tbl_properties.php3 b/tbl_properties.php3
index e440c623f..9aac822e3 100755
--- a/tbl_properties.php3
+++ b/tbl_properties.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_properties_common.php3 b/tbl_properties_common.php3
index c18f3c7e6..5a4ce641a 100755
--- a/tbl_properties_common.php3
+++ b/tbl_properties_common.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_properties_export.php3 b/tbl_properties_export.php3
index 578d53937..ccb1d74d6 100755
--- a/tbl_properties_export.php3
+++ b/tbl_properties_export.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_properties_links.php3 b/tbl_properties_links.php3
index 14e816d59..643d3e386 100755
--- a/tbl_properties_links.php3
+++ b/tbl_properties_links.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_properties_operations.php3 b/tbl_properties_operations.php3
index 7226f3602..a03d23af9 100755
--- a/tbl_properties_operations.php3
+++ b/tbl_properties_operations.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_properties_options.php3 b/tbl_properties_options.php3
index 7d236cc99..36cdaf9a3 100755
--- a/tbl_properties_options.php3
+++ b/tbl_properties_options.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_properties_structure.php3 b/tbl_properties_structure.php3
index de0b5074c..df9c794ff 100755
--- a/tbl_properties_structure.php3
+++ b/tbl_properties_structure.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_properties_table_info.php3 b/tbl_properties_table_info.php3
index b62563833..359f86366 100755
--- a/tbl_properties_table_info.php3
+++ b/tbl_properties_table_info.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 // this should be recoded as functions, to avoid messing with global
 // variables
diff --git a/tbl_query_box.php3 b/tbl_query_box.php3
index 7d1b31ff6..ef7619baa 100755
--- a/tbl_query_box.php3
+++ b/tbl_query_box.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_relation.php3 b/tbl_relation.php3
index 315f5a5e5..2b776f967 100644
--- a/tbl_relation.php3
+++ b/tbl_relation.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_rename.php3 b/tbl_rename.php3
index 6843a5f01..e2ab1fc0a 100755
--- a/tbl_rename.php3
+++ b/tbl_rename.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_replace.php3 b/tbl_replace.php3
index e50f42e22..6a2295c3a 100755
--- a/tbl_replace.php3
+++ b/tbl_replace.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/tbl_select.php3 b/tbl_select.php3
index 4e9b50815..616d535da 100755
--- a/tbl_select.php3
+++ b/tbl_select.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/user_details.php3 b/user_details.php3
index 18e73eb66..e1fc92185 100644
--- a/user_details.php3
+++ b/user_details.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$*/
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
diff --git a/user_password.php3 b/user_password.php3
index eaae8e8f6..453f4e178 100644
--- a/user_password.php3
+++ b/user_password.php3
@@ -1,5 +1,6 @@
 <?php
 /* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**