aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.vim13
1 files changed, 13 insertions, 0 deletions
diff --git a/init.vim b/init.vim
index b29971d..b4ab946 100644
--- a/init.vim
+++ b/init.vim
@@ -1,3 +1,6 @@
+scriptencoding utf-8
+set encoding=utf-8
+
execute pathogen#infect('bundle/{}', 'themes/{}')
" Maily for the ability to match HTML tags with '%'
@@ -7,6 +10,8 @@ runtime macros/matchit.vim
" My old standard theme
colorscheme distinguished
+" colorscheme solarized
+set background=dark
" colorscheme solarized
" let g:solarized_termcolors=256
@@ -122,6 +127,7 @@ set noexpandtab
autocmd Filetype python call SetPythonOptions()
autocmd Filetype htmldjango call SethtmldjangoOptions()
autocmd Filetype json call SetJsonOptions()
+autocmd Filetype javascript call SetjavascriptOptions()
autocmd Filetype php call SetPHPOptions()
autocmd Filetype html call SetHTMLOptions()
autocmd Filetype sh call SetShellOptions()
@@ -143,6 +149,13 @@ function SetPythonOptions()
filetype indent on
set smartindent
endfunction
+function SetjavascriptOptions()
+ set tabstop=2
+ set shiftwidth=2
+ set expandtab
+ filetype indent on
+ set smartindent
+endfunction
function SetJsonOptions()
set tabstop=3
set shiftwidth=3