Remove enc=utf-8 in VIM modeline as it is not allowed in VIM 7.3

As of VIM 7.3 it is no longer possible to specify the encoding in the
modeline. This gives an error message whenever such a file is opened,
thus this commit removes the enc setting from the modeline.

78 files changed, 78 insertions, 78 deletions

diff --git a/_test/cases/inc/IXR_Library_IXR_Message.test.php b/_test/cases/inc/IXR_Library_IXR_Message.test.php
index 2a8133230..bc9be572d 100644
--- a/_test/cases/inc/IXR_Library_IXR_Message.test.php
+++ b/_test/cases/inc/IXR_Library_IXR_Message.test.php
@@ -136,4 +136,4 @@ class ixr_library_ixr_message_test extends UnitTestCase {
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/IXR_Library_date.test.php b/_test/cases/inc/IXR_Library_date.test.php
index a2b6154d8..28fa86486 100644
--- a/_test/cases/inc/IXR_Library_date.test.php
+++ b/_test/cases/inc/IXR_Library_date.test.php
@@ -31,4 +31,4 @@ class ixr_library_date_test extends UnitTestCase {
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/auth_aclcheck.test.php b/_test/cases/inc/auth_aclcheck.test.php
index d8a8f285a..ff092c2de 100644
--- a/_test/cases/inc/auth_aclcheck.test.php
+++ b/_test/cases/inc/auth_aclcheck.test.php
@@ -228,4 +228,4 @@ class auth_acl_test extends UnitTestCase {
 
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/auth_admincheck.test.php b/_test/cases/inc/auth_admincheck.test.php
index f14d6369e..b21c2fe27 100644
--- a/_test/cases/inc/auth_admincheck.test.php
+++ b/_test/cases/inc/auth_admincheck.test.php
@@ -50,4 +50,4 @@ class auth_admin_test extends UnitTestCase {
 
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/auth_nameencode.test.php b/_test/cases/inc/auth_nameencode.test.php
index 28ab6dc4a..56806a862 100644
--- a/_test/cases/inc/auth_nameencode.test.php
+++ b/_test/cases/inc/auth_nameencode.test.php
@@ -47,4 +47,4 @@ class auth_nameencode_test extends UnitTestCase {
     }
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/auth_password.test.php b/_test/cases/inc/auth_password.test.php
index 1ba731c7e..cb1cd5593 100644
--- a/_test/cases/inc/auth_password.test.php
+++ b/_test/cases/inc/auth_password.test.php
@@ -40,4 +40,4 @@ class auth_password_test extends UnitTestCase {
 
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/common_clientip.test.php b/_test/cases/inc/common_clientip.test.php
index 4df463539..68c108165 100644
--- a/_test/cases/inc/common_clientip.test.php
+++ b/_test/cases/inc/common_clientip.test.php
@@ -152,4 +152,4 @@ class common_clientIP_test extends UnitTestCase {
 
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/common_obfuscate.test.php b/_test/cases/inc/common_obfuscate.test.php
index 3e1e1a72f..31321bea1 100644
--- a/_test/cases/inc/common_obfuscate.test.php
+++ b/_test/cases/inc/common_obfuscate.test.php
@@ -25,4 +25,4 @@ class common_obfuscate_test extends UnitTestCase {
 
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/common_pagetemplate.test.php b/_test/cases/inc/common_pagetemplate.test.php
index ecba0f966..2db8b64ae 100644
--- a/_test/cases/inc/common_pagetemplate.test.php
+++ b/_test/cases/inc/common_pagetemplate.test.php
@@ -16,4 +16,4 @@ class common_pagetemplate_test extends UnitTestCase {
         error_reporting($old);
     }
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/indexer_idx_indexlengths.test.php b/_test/cases/inc/indexer_idx_indexlengths.test.php
index 8565639be..a0f7c9224 100644
--- a/_test/cases/inc/indexer_idx_indexlengths.test.php
+++ b/_test/cases/inc/indexer_idx_indexlengths.test.php
@@ -57,4 +57,4 @@ class indexer_idx_indexlengths_test extends UnitTestCase {
 }
 
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/init_fullpath.test.php b/_test/cases/inc/init_fullpath.test.php
index 63394b09d..aa63b0ce9 100644
--- a/_test/cases/inc/init_fullpath.test.php
+++ b/_test/cases/inc/init_fullpath.test.php
@@ -86,4 +86,4 @@ class init_fullpath_test extends UnitTestCase {
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/init_getbaseurl.test.php b/_test/cases/inc/init_getbaseurl.test.php
index edd370d61..d9c76801f 100644
--- a/_test/cases/inc/init_getbaseurl.test.php
+++ b/_test/cases/inc/init_getbaseurl.test.php
@@ -277,4 +277,4 @@ class init_getBaseURL_test extends UnitTestCase {
     }
 }
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/_test/cases/inc/mail_isvalid.test.php b/_test/cases/inc/mail_isvalid.test.php
index 374204679..4e047499f 100644
--- a/_test/cases/inc/mail_isvalid.test.php
+++ b/_test/cases/inc/mail_isvalid.test.php
@@ -80,4 +80,4 @@ class mail_isvalid extends UnitTestCase {
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/mail_quoted_printable_encode.php b/_test/cases/inc/mail_quoted_printable_encode.php
index c9cb040f1..a5a36e35b 100644
--- a/_test/cases/inc/mail_quoted_printable_encode.php
+++ b/_test/cases/inc/mail_quoted_printable_encode.php
@@ -41,4 +41,4 @@ class mail_quotedprintable_encode extends UnitTestCase {
     }
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/mail_send.php b/_test/cases/inc/mail_send.php
index 5c2b0e896..e41c501fe 100644
--- a/_test/cases/inc/mail_send.php
+++ b/_test/cases/inc/mail_send.php
@@ -46,4 +46,4 @@ class mail_send extends UnitTestCase {
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/pageutils_clean_id.test.php b/_test/cases/inc/pageutils_clean_id.test.php
index 9c03ce334..01fa7dc1c 100644
--- a/_test/cases/inc/pageutils_clean_id.test.php
+++ b/_test/cases/inc/pageutils_clean_id.test.php
@@ -144,4 +144,4 @@ class init_clean_id_test extends UnitTestCase {
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/pageutils_getid.test.php b/_test/cases/inc/pageutils_getid.test.php
index e3932a579..7fccc3a60 100644
--- a/_test/cases/inc/pageutils_getid.test.php
+++ b/_test/cases/inc/pageutils_getid.test.php
@@ -103,4 +103,4 @@ class init_getID_test extends UnitTestCase {
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/pageutils_resolve_id.test.php b/_test/cases/inc/pageutils_resolve_id.test.php
index 64b4033cd..9aa4ee8b7 100644
--- a/_test/cases/inc/pageutils_resolve_id.test.php
+++ b/_test/cases/inc/pageutils_resolve_id.test.php
@@ -42,4 +42,4 @@ class init_resolve_id_test extends UnitTestCase {
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/pageutils_resolve_pageid.test.php b/_test/cases/inc/pageutils_resolve_pageid.test.php
index ab282b57a..d9ea89869 100644
--- a/_test/cases/inc/pageutils_resolve_pageid.test.php
+++ b/_test/cases/inc/pageutils_resolve_pageid.test.php
@@ -60,4 +60,4 @@ class init_resolve_pageid_test extends UnitTestCase {
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/safefn.test.php b/_test/cases/inc/safefn.test.php
index b93914bf8..c789875ba 100644
--- a/_test/cases/inc/safefn.test.php
+++ b/_test/cases/inc/safefn.test.php
@@ -32,4 +32,4 @@ class safeFN_test extends UnitTestCase {
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/utf8_correctidx.test.php b/_test/cases/inc/utf8_correctidx.test.php
index d95ce9ae0..20f6ba3a3 100644
--- a/_test/cases/inc/utf8_correctidx.test.php
+++ b/_test/cases/inc/utf8_correctidx.test.php
@@ -75,4 +75,4 @@ class utf8_correctidx_test extends UnitTestCase {
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/utf8_html.test.php b/_test/cases/inc/utf8_html.test.php
index 57c9df259..3e6d35bc7 100644
--- a/_test/cases/inc/utf8_html.test.php
+++ b/_test/cases/inc/utf8_html.test.php
@@ -69,4 +69,4 @@ class utf8_html_test extends UnitTestCase {
 
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/utf8_romanize.test.php b/_test/cases/inc/utf8_romanize.test.php
index 9aade570b..950c8842a 100644
--- a/_test/cases/inc/utf8_romanize.test.php
+++ b/_test/cases/inc/utf8_romanize.test.php
@@ -33,4 +33,4 @@ class utf8_romanize_test extends UnitTestCase {
         $this->assertEqual("a A a A a o O",utf8_romanize("å Å ä Ä ä ö Ö"));
     }
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/utf8_stripspecials.test.php b/_test/cases/inc/utf8_stripspecials.test.php
index a42507a3c..85df75fa1 100644
--- a/_test/cases/inc/utf8_stripspecials.test.php
+++ b/_test/cases/inc/utf8_stripspecials.test.php
@@ -24,4 +24,4 @@ class utf8_stripspecials extends UnitTestCase {
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/utf8_substr.test.php b/_test/cases/inc/utf8_substr.test.php
index f3bf1b154..2806d34f1 100644
--- a/_test/cases/inc/utf8_substr.test.php
+++ b/_test/cases/inc/utf8_substr.test.php
@@ -40,4 +40,4 @@ class utf8_substr_test extends UnitTestCase {
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/utf8_unicode.test.php b/_test/cases/inc/utf8_unicode.test.php
index 453aad216..424f47d11 100644
--- a/_test/cases/inc/utf8_unicode.test.php
+++ b/_test/cases/inc/utf8_unicode.test.php
@@ -57,4 +57,4 @@ class utf8_unicode_test extends UnitTestCase {
 
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/utf8_utf16be.test.php b/_test/cases/inc/utf8_utf16be.test.php
index 3a346da51..d8b8746f2 100644
--- a/_test/cases/inc/utf8_utf16be.test.php
+++ b/_test/cases/inc/utf8_utf16be.test.php
@@ -25,4 +25,4 @@ class utf8_utf16be_test extends UnitTestCase {
     }
 }
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/_test/cases/lib/exe/css_css_compress.test.php b/_test/cases/lib/exe/css_css_compress.test.php
index 026caad3c..527071bbe 100644
--- a/_test/cases/lib/exe/css_css_compress.test.php
+++ b/_test/cases/lib/exe/css_css_compress.test.php
@@ -65,4 +65,4 @@ class css_css_compress_test extends UnitTestCase {
 
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/lib/exe/js_js_compress.test.php b/_test/cases/lib/exe/js_js_compress.test.php
index 9051dfb01..76b51e5ab 100644
--- a/_test/cases/lib/exe/js_js_compress.test.php
+++ b/_test/cases/lib/exe/js_js_compress.test.php
@@ -120,4 +120,4 @@ class js_js_compress_test extends UnitTestCase {
     }
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/bin/indexer.php b/bin/indexer.php
index 48e98b571..67254fa88 100755
--- a/bin/indexer.php
+++ b/bin/indexer.php
@@ -163,4 +163,4 @@ function _quietecho($msg) {
     if(!$QUIET) echo $msg;
 }
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/feed.php b/feed.php
index 0980dfaa8..9536c9986 100644
--- a/feed.php
+++ b/feed.php
@@ -349,4 +349,4 @@ function rssSearch($opt){
     return $data;
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/inc/DifferenceEngine.php b/inc/DifferenceEngine.php
index 1ff6a9fba..08e09c65f 100644
--- a/inc/DifferenceEngine.php
+++ b/inc/DifferenceEngine.php
@@ -1158,4 +1158,4 @@ class InlineDiffFormatter extends DiffFormatter {
 }
 
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index e68679bde..b23616ef1 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -600,4 +600,4 @@ class HTTPClient {
 
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/inc/actions.php b/inc/actions.php
index fb2ae452f..d98382a3b 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -743,4 +743,4 @@ function subscription_handle_post(&$params) {
     $params = compact('target', 'style', 'data', 'action');
 }
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/auth.php b/inc/auth.php
index a2844a732..6bc4f8673 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -1117,4 +1117,4 @@ function auth_getCookie(){
     return array($user,$sticky,$pass);
 }
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php
index 90fe0266b..41e9d854b 100644
--- a/inc/auth/ad.class.php
+++ b/inc/auth/ad.class.php
@@ -296,4 +296,4 @@ class auth_ad extends auth_basic {
     }
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/inc/auth/basic.class.php b/inc/auth/basic.class.php
index fa38970ae..c7e7031bf 100644
--- a/inc/auth/basic.class.php
+++ b/inc/auth/basic.class.php
@@ -400,4 +400,4 @@ class auth_basic {
   }
 
 }
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/auth/ldap.class.php b/inc/auth/ldap.class.php
index 7f1eec187..420043238 100644
--- a/inc/auth/ldap.class.php
+++ b/inc/auth/ldap.class.php
@@ -457,4 +457,4 @@ class auth_ldap extends auth_basic {
     }
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/inc/auth/mysql.class.php b/inc/auth/mysql.class.php
index ca607ced5..dbdfe5fda 100644
--- a/inc/auth/mysql.class.php
+++ b/inc/auth/mysql.class.php
@@ -936,4 +936,4 @@ class auth_mysql extends auth_basic {
     }
 }
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/auth/pgsql.class.php b/inc/auth/pgsql.class.php
index 8e68e865e..cf8bf7600 100644
--- a/inc/auth/pgsql.class.php
+++ b/inc/auth/pgsql.class.php
@@ -407,4 +407,4 @@ class auth_pgsql extends auth_mysql {
 
 }
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/auth/plain.class.php b/inc/auth/plain.class.php
index ec9e52beb..3941190e9 100644
--- a/inc/auth/plain.class.php
+++ b/inc/auth/plain.class.php
@@ -325,4 +325,4 @@ class auth_plain extends auth_basic {
     }
 }
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/common.php b/inc/common.php
index 667846804..b6048825b 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -1541,4 +1541,4 @@ function valid_input_set($param, $valid_values, $array, $exc = '') {
     }
 }
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/confutils.php b/inc/confutils.php
index 4306dab8f..26ed4f087 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -324,4 +324,4 @@ function conf_decodeString($str) {
                      return $str;
     }
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/inc/feedcreator.class.php b/inc/feedcreator.class.php
index 8141d867c..435add6ac 100644
--- a/inc/feedcreator.class.php
+++ b/inc/feedcreator.class.php
@@ -1577,4 +1577,4 @@ class DokuWikiFeedCreator extends UniversalFeedCreator{
 
 
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/inc/fulltext.php b/inc/fulltext.php
index 7ace3a724..59a9c1d96 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -756,4 +756,4 @@ function ft_termParser($term, &$stopwords, $consider_asian = true, $phrase_mode
     return $parsed;
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/inc/indexer.php b/inc/indexer.php
index f5330040a..5a361ddc5 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -701,4 +701,4 @@ function idx_tokenizer($string,&$stopwords,$wc=false){
     return $words;
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 5c890246c..9ccbe14e0 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -316,4 +316,4 @@ $lang['seconds'] = '%d seconds ago';
 $lang['wordblock'] = 'Your change was not saved because it contains blocked text (spam).';
 
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index ef540bb3d..ee765b5b5 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -211,4 +211,4 @@ $lang['js']['del_confirm']= 'Kas kustutame selle kirje?';
 #$lang['unsubscribe_success'] = '';
 #$lang['unsubscribe_error'] = '';
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/km/lang.php b/inc/lang/km/lang.php
index 19847674d..3519a484e 100644
--- a/inc/lang/km/lang.php
+++ b/inc/lang/km/lang.php
@@ -227,4 +227,4 @@ $lang['i_pol2']       = 'វីគីបិទជិត';
 
 $lang['i_retry']      = 'ម្តងទៀត';
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/ku/lang.php b/inc/lang/ku/lang.php
index cb8dd0865..0ff2ca4ca 100644
--- a/inc/lang/ku/lang.php
+++ b/inc/lang/ku/lang.php
@@ -160,4 +160,4 @@ $lang['subscribe_noaddress']= 'There is no address associated with your login, y
 $lang['unsubscribe_success']= 'Removed %s from subscription list for %s';
 $lang['unsubscribe_error']  = 'Error removing %s from subscription list for %s';
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/mg/lang.php b/inc/lang/mg/lang.php
index 2ecbcdcff..3727cfe9a 100644
--- a/inc/lang/mg/lang.php
+++ b/inc/lang/mg/lang.php
@@ -132,4 +132,4 @@ $lang['acl_perm8']  = 'Mandefa rakitra';
 $lang['acl_perm16'] = 'Mamafa';
 $lang['acl_new']    = 'Ampio andalana vaovao';
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php
index 168fe3595..750433910 100644
--- a/inc/lang/vi/lang.php
+++ b/inc/lang/vi/lang.php
@@ -103,4 +103,4 @@ $lang['qb_sig']     = 'Đặt chữ ký';
 $lang['js']['del_confirm']= 'Xoá mục này?';
 
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index a96e6b9db..4d0b56b44 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -1707,4 +1707,4 @@ class Doku_Handler_Block {
     }
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/inc/parser/lexer.php b/inc/parser/lexer.php
index 211945d8f..b5bcb9612 100644
--- a/inc/parser/lexer.php
+++ b/inc/parser/lexer.php
@@ -597,4 +597,4 @@ function Doku_Lexer_Escape($str) {
     return preg_replace($chars, $escaped, $str);
 }
 
-//Setup VIM: ex: et ts=4 sw=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 sw=4 :
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index f635ea1d5..263745593 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -479,4 +479,4 @@ class Doku_Renderer_metadata extends Doku_Renderer {
   }
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 20f0e6ca3..2e6b7791a 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -957,4 +957,4 @@ class Doku_Parser_Mode_emaillink extends Doku_Parser_Mode {
 }
 
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index a178b2457..7002fd0cb 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -319,4 +319,4 @@ class Doku_Renderer extends DokuWiki_Plugin {
 }
 
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 37900b2c3..b0d93f93e 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -1205,4 +1205,4 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/inc/parser/xhtmlsummary.php b/inc/parser/xhtmlsummary.php
index b187fef01..95f86cbef 100644
--- a/inc/parser/xhtmlsummary.php
+++ b/inc/parser/xhtmlsummary.php
@@ -87,4 +87,4 @@ class Doku_Renderer_xhtmlsummary extends Doku_Renderer_xhtml {
 }
 
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/search.php b/inc/search.php
index a6787c5d2..db0b008f0 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -624,4 +624,4 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){
     return $return;
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/inc/template.php b/inc/template.php
index b89f7abbc..d171ab075 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1372,5 +1372,5 @@ function tpl_getFavicon() {
 }
 
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
 
diff --git a/inc/toolbar.php b/inc/toolbar.php
index 8bcf6f030..58d80043c 100644
--- a/inc/toolbar.php
+++ b/inc/toolbar.php
@@ -252,4 +252,4 @@ function toolbar_signature(){
     return $sig;
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index e9c59ca5d..e514762fd 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -339,4 +339,4 @@ function ajax_linkwiz(){
 
 }
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/lib/exe/css.php b/lib/exe/css.php
index 76f40c7bb..e64ebc22a 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -330,4 +330,4 @@ function css_comment_cb($matches){
     return $matches[0];
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php
index 680fd9ae4..3ad4f1937 100644
--- a/lib/exe/fetch.php
+++ b/lib/exe/fetch.php
@@ -198,4 +198,4 @@ function calc_cache($cache){
   return -1; //cache endless
 }
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index bf5bad2e7..58b0d0787 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -302,6 +302,6 @@ function sendGIF(){
     // Thinks it's got the whole image
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
 // No trailing PHP closing tag - no output please!
 // See Note at http://www.php.net/manual/en/language.basic-syntax.instruction-separation.php
diff --git a/lib/exe/js.php b/lib/exe/js.php
index f9682e1e9..117021308 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -396,4 +396,4 @@ function js_compress($s){
     return trim($result);
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/exe/opensearch.php b/lib/exe/opensearch.php
index f16b4f681..03a1632c4 100644
--- a/lib/exe/opensearch.php
+++ b/lib/exe/opensearch.php
@@ -35,4 +35,4 @@ echo '  <Url type="application/x-suggestions+json" template="'.
         DOKU_URL.'lib/exe/ajax.php?call=suggestions&amp;q={searchTerms}" />'.NL;
 echo '</OpenSearchDescription>'.NL;
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php
index 8c2bec6f9..d232930a3 100644
--- a/lib/exe/xmlrpc.php
+++ b/lib/exe/xmlrpc.php
@@ -968,4 +968,4 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
 
 $server = new dokuwiki_xmlrpc_server();
 
-// vim:ts=4:sw=4:et:enc=utf-8:
+// vim:ts=4:sw=4:et:
diff --git a/lib/plugins/acl/lang/en/lang.php b/lib/plugins/acl/lang/en/lang.php
index 38ff20c88..779614d32 100644
--- a/lib/plugins/acl/lang/en/lang.php
+++ b/lib/plugins/acl/lang/en/lang.php
@@ -43,4 +43,4 @@ $lang['acl_perm8']  = 'Upload';
 $lang['acl_perm16'] = 'Delete';
 $lang['acl_new']    = 'Add new Entry';
 $lang['acl_mod']    = 'Modify Entry';
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/lib/plugins/acl/lang/et/lang.php b/lib/plugins/acl/lang/et/lang.php
index e90d5eaa9..2f7208b7c 100644
--- a/lib/plugins/acl/lang/et/lang.php
+++ b/lib/plugins/acl/lang/et/lang.php
@@ -20,4 +20,4 @@ $lang['acl_perm2']  = 'Toimetamine';
 $lang['acl_perm4']  = 'Tekitamine';
 $lang['acl_perm8']  = 'Üles laadimine';
 $lang['acl_new']    = 'Uue kirje lisamine';
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/lib/plugins/acl/lang/vi/lang.php b/lib/plugins/acl/lang/vi/lang.php
index 4458d806b..6237f79ba 100644
--- a/lib/plugins/acl/lang/vi/lang.php
+++ b/lib/plugins/acl/lang/vi/lang.php
@@ -18,4 +18,4 @@ $lang['acl_perm2']  = 'Biên soạn';
 $lang['acl_perm4']  = 'Tạo';
 $lang['acl_perm8']  = 'Tải lên';
 $lang['acl_new']    = 'Thêm mục mới';
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+//Setup VIM: ex: et ts=2 :
diff --git a/lib/plugins/admin.php b/lib/plugins/admin.php
index 25f01b657..9a1fb9fdc 100644
--- a/lib/plugins/admin.php
+++ b/lib/plugins/admin.php
@@ -43,4 +43,4 @@ class DokuWiki_Admin_Plugin extends DokuWiki_Plugin {
         return array();
     }
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index ba2831a90..026a438bb 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -253,4 +253,4 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
     }
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/plugin/lang/en/lang.php b/lib/plugins/plugin/lang/en/lang.php
index e575d3d67..ccbd207e9 100644
--- a/lib/plugins/plugin/lang/en/lang.php
+++ b/lib/plugins/plugin/lang/en/lang.php
@@ -74,4 +74,4 @@ $lang['notenabled']       = 'Plugin %s could not be enabled, check file permissi
 $lang['disabled']         = 'Plugin %s disabled.';
 $lang['notdisabled']      = 'Plugin %s could not be disabled, check file permissions.';
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php
index 8a2cd5553..e188e2488 100644
--- a/lib/plugins/revert/admin.php
+++ b/lib/plugins/revert/admin.php
@@ -196,4 +196,4 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin {
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/revert/lang/en/lang.php b/lib/plugins/revert/lang/en/lang.php
index a2002f1a7..6bf867ded 100644
--- a/lib/plugins/revert/lang/en/lang.php
+++ b/lib/plugins/revert/lang/en/lang.php
@@ -20,4 +20,4 @@ $lang['revstop']  = 'Reversion process finished successfully.';
 $lang['note1']    = 'Note: this search is case sensitive';
 $lang['note2']    = 'Note: the page will be reverted to the last version not containing the given spam term <i>%s</i>.';
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php
index 127b92ce5..05b0dc466 100644
--- a/lib/plugins/syntax.php
+++ b/lib/plugins/syntax.php
@@ -276,4 +276,4 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode {
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :