From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Mon, 25 Apr 2016 12:07:44 +0000 (+0100)
Subject: Merge branch 'master' of github.com:maxf130/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=494fd1d52e812b56a7f0f5c37cf3055d55041b0b;hp=-c;p=max%2Fdotfiles.git

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

494fd1d52e812b56a7f0f5c37cf3055d55041b0b
diff --combined vimrc
index ee9534f,e92096f..51f96d0
--- a/vimrc
+++ b/vimrc
@@@ -19,14 -19,16 +19,17 @@@ 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'
  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
@@@ -53,8 -55,10 +56,10 @@@ set statusline+=%
  let g:syntastic_always_populate_loc_list = 1
  let g:syntastic_auto_loc_list = 2
  let g:syntastic_check_on_open = 0
- let g:syntastic_check_on_wq = 0
+ let g:syntastic_check_on_wq = 1
  let g:syntastic_javascript_checkers = ['eslint']
+ "let g:syntastic_python_python_exec = '/usr/bin/python3'
+ "let g:syntastic_python_checkers = ['flake8']
  
  " Syntastic C++11
  let g:syntastic_cpp_compiler = 'g++'
@@@ -86,3 -90,8 +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