Merge branch 'master' of github.com:maxf130/dotfiles

[max/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index fbe7147eaa74175aca271a7e9189a37f92bf05c9..51f96d0652a4a6138e0ea5a5f2b4e65730756337 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -19,7 +19,8 @@ Plugin 'Raimondi/delimitMate'
 Plugin 'scrooloose/syntastic'
 Plugin 'ternjs/tern_for_vim'
 Plugin 'docunext/closetag.vim'
-Plugin 'bling/vim-airline'
+Plugin 'vim-airline/vim-airline'
+Plugin 'vim-airline/vim-airline-themes'
 Plugin 'airblade/vim-gitgutter'
 Plugin 'tpope/vim-fugitive'
 Plugin 'kien/ctrlp.vim'
@@ -27,6 +28,8 @@ Plugin 'editorconfig/editorconfig-vim'
 Plugin 'LaTeX-Box-Team/LaTeX-Box'
 Plugin 'ajh17/VimCompletesMe'
 Plugin 'hynek/vim-python-pep8-indent'
+Plugin 'vim-scripts/octave.vim--'
+Plugin 'vim-scripts/MatlabFilesEdition'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -88,3 +91,8 @@ let g:clang_user_options='|| exit0'
 " Color 80th column
 highlight ColorColumn ctermbg=237
 set colorcolumn=80
+
+" Octave Syntax
+" augroup filetypedetect
+"   au! BufRead,BufNewFile *.m,*.oct set filetype=octave
+" augroup END