summaryrefslogtreecommitdiff
path: root/inc
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 /inc
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 'inc')
-rw-r--r--inc/DifferenceEngine.php2
-rw-r--r--inc/HTTPClient.php2
-rw-r--r--inc/actions.php2
-rw-r--r--inc/auth.php2
-rw-r--r--inc/auth/ad.class.php2
-rw-r--r--inc/auth/basic.class.php2
-rw-r--r--inc/auth/ldap.class.php2
-rw-r--r--inc/auth/mysql.class.php2
-rw-r--r--inc/auth/pgsql.class.php2
-rw-r--r--inc/auth/plain.class.php2
-rw-r--r--inc/common.php2
-rw-r--r--inc/confutils.php2
-rw-r--r--inc/feedcreator.class.php2
-rw-r--r--inc/fulltext.php2
-rw-r--r--inc/indexer.php2
-rw-r--r--inc/lang/en/lang.php2
-rw-r--r--inc/lang/et/lang.php2
-rw-r--r--inc/lang/km/lang.php2
-rw-r--r--inc/lang/ku/lang.php2
-rw-r--r--inc/lang/mg/lang.php2
-rw-r--r--inc/lang/vi/lang.php2
-rw-r--r--inc/parser/handler.php2
-rw-r--r--inc/parser/lexer.php2
-rw-r--r--inc/parser/metadata.php2
-rw-r--r--inc/parser/parser.php2
-rw-r--r--inc/parser/renderer.php2
-rw-r--r--inc/parser/xhtml.php2
-rw-r--r--inc/parser/xhtmlsummary.php2
-rw-r--r--inc/search.php2
-rw-r--r--inc/template.php2
-rw-r--r--inc/toolbar.php2
31 files changed, 31 insertions, 31 deletions
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 :