summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMichael Hamann <michael@content-space.de>2010-11-29 01:34:36 +0100
committerMichael Hamann <michael@content-space.de>2010-11-29 16:19:49 +0100
commite3776c06c37cc197709dac60892604dfea894ac2 (patch)
treece6feb82b859ffd0821e6b6f7c461860b18fbcff /lib
parent4871414204799044c31aa2764c4b4ca020e2331d (diff)
downloadrpg-e3776c06c37cc197709dac60892604dfea894ac2.tar.gz
rpg-e3776c06c37cc197709dac60892604dfea894ac2.tar.bz2
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/exe/ajax.php2
-rw-r--r--lib/exe/css.php2
-rw-r--r--lib/exe/fetch.php2
-rw-r--r--lib/exe/indexer.php2
-rw-r--r--lib/exe/js.php2
-rw-r--r--lib/exe/opensearch.php2
-rw-r--r--lib/exe/xmlrpc.php2
-rw-r--r--lib/plugins/acl/lang/en/lang.php2
-rw-r--r--lib/plugins/acl/lang/et/lang.php2
-rw-r--r--lib/plugins/acl/lang/vi/lang.php2
-rw-r--r--lib/plugins/admin.php2
-rw-r--r--lib/plugins/info/syntax.php2
-rw-r--r--lib/plugins/plugin/lang/en/lang.php2
-rw-r--r--lib/plugins/revert/admin.php2
-rw-r--r--lib/plugins/revert/lang/en/lang.php2
-rw-r--r--lib/plugins/syntax.php2
16 files changed, 16 insertions, 16 deletions
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 :