vim: added modeline, changed indentation; updated submodules

1 files changed, 47 insertions, 45 deletions

diff --git a/vimrc b/vimrc
index e43a23a..234b3f1 100644
--- a/vimrc
+++ b/vimrc
@@ -3,33 +3,33 @@ runtime bundle/pathogen/autoload/pathogen.vim
 execute pathogen#infect()
 runtime ftplugin/man.vim
 
-set nocompatible	" don't be compatible to vi
-set showcmd		" show entered commands in status line
-set showmatch		" show matching brackets
-set autoindent		" indent new lines correctly
-set hlsearch		" highlight search results
-set ignorecase		" case-insensitive searching
-set background=dark	" color scheme for dark background
-set title		" set terminal title
-set ruler		" show line/column of cursor in status line
-set tabstop=4		" display a tab as 4 spaces
-"set softtabstop=4	" (soft) indent tabs with 4 spaces
-set shiftwidth=4	" (auto)indent with 4 spaces (> <)
-set noexpandtab		" don't expand tabs to spaces
-set nobackup		" don't keep backup files
-set showtabline=2	" always show tab line
-set hidden		" change buffers without saving
-set cursorline		" highlight current cursor line
-set scrolloff=4		" keep 4 lines context when scrolling
-set laststatus=2	" always show status line
-set ttimeoutlen=50	" faster switch from insert to normal mode
-set noshowmode		" don't show current mode (done by airline)
-set encoding=utf-8	" use utf8 by default
-syntax on		" enable syntax highlighting
+set nocompatible            " don't be compatible to vi
+set showcmd                 " show entered commands in status line
+set showmatch               " show matching brackets
+set autoindent              " indent new lines correctly
+set hlsearch                " highlight search results
+set ignorecase              " case-insensitive searching
+set background=dark         " color scheme for dark background
+set title                   " set terminal title
+set ruler                   " show line/column of cursor in status line
+set tabstop=4               " display a tab as 4 spaces
+"set softtabstop=4          " (soft) indent tabs with 4 spaces
+set shiftwidth=4            " (auto)indent with 4 spaces (> <)
+set noexpandtab             " don't expand tabs to spaces
+set nobackup                " don't keep backup files
+set showtabline=2           " always show tab line
+set hidden                  " change buffers without saving
+set cursorline              " highlight current cursor line
+set scrolloff=4             " keep 4 lines context when scrolling
+set laststatus=2            " always show status line
+set ttimeoutlen=50          " faster switch from insert to normal mode
+set noshowmode              " don't show current mode (done by airline)
+set encoding=utf-8          " use utf8 by default
+syntax on                   " enable syntax highlighting
 filetype plugin indent on
 
-set directory=~/.vim/swap,.,~/tmp,/var/tmp,/tmp		" directory where to save/search swap files
-set viminfo+=n~/.vim/viminfo				" different location for viminfo file
+set directory=~/.vim/swap,.,~/tmp,/var/tmp,/tmp     " directory where to save/search swap files
+set viminfo+=n~/.vim/viminfo                        " different location for viminfo file
 
 " make indentation and trailing whitespaces visible
 set list listchars=tab:\ \ ,trail:·
@@ -45,9 +45,9 @@ autocmd InsertLeave * if &number | set relativenumber | endif
 
 " show cursorline only in active window
 augroup CursorLine
-	autocmd!
-	autocmd VimEnter,WinEnter,BufWinEnter * set cursorline
-	autocmd WinLeave * set nocursorline
+    autocmd!
+    autocmd VimEnter,WinEnter,BufWinEnter * set cursorline
+    autocmd WinLeave * set nocursorline
 augroup END
 
 " highlighting settings
@@ -65,29 +65,30 @@ endif
 
 
 " file browser
-let g:netrw_liststyle=3		" tree style listing
-let g:netrw_banner=0		" suppress banner on top
-"let g:netrw_browse_split=3	" open files in new tab
-let g:netrw_list_hide='^\..*$'	" don't show hidden files
+let g:netrw_liststyle=3             " tree style listing
+let g:netrw_banner=0                " suppress banner on top
+"let g:netrw_browse_split=3         " open files in new tab
+let g:netrw_list_hide='^\..*$'      " don't show hidden files
 
 
 " key mappings
-nnoremap <silent> <SPACE>	:nohlsearch<CR>
-nmap tn				:tabnew<CR>
-nmap tc				:tabclose<CR>
-noremap <silent> <F3>		:BufExplorerHorizontalSplit<CR>
-nnoremap <silent> <F4>		:TagbarToggle<CR>
-nnoremap <silent> <F6>		:SyntasticCheck<CR>
+nnoremap    <silent> <SPACE>        :nohlsearch<CR>
+nmap        tn                      :tabnew<CR>
+nmap        tc                      :tabclose<CR>
+noremap     <silent> <F3>           :BufExplorerHorizontalSplit<CR>
+nnoremap    <silent> <F4>           :TagbarToggle<CR>
+nnoremap    <silent> <F6>           :SyntasticCheck<CR>
 
 
 " different keycodes in urxvt
-nmap    <ESC>[5^    <C-PageUp>
-nmap    <ESC>[6^    <C-PageDown>
+nmap        <ESC>[5^                <C-PageUp>
+nmap        <ESC>[6^                <C-PageDown>
+
 
 " folding settings;  disabled for now because of performance problems
-"set foldmethod=syntax		" fold automatically by syntax rules
-"set foldlevel=0		" fold from top level
-"set foldnestmax=1		" fold only 1 level
+"set foldmethod=syntax              " fold automatically by syntax rules
+"set foldlevel=0                    " fold from top level
+"set foldnestmax=1                  " fold only 1 level
 "let perl_fold=1
 "let perl_nofold_packages=0
 
@@ -102,7 +103,8 @@ let g:airline_theme='wombat'
 let g:airline#extensions#whitespace#enabled=0
 
 " Syntastic settings
-let g:syntastic_check_on_wq=0			" don't check when closing buffers
-let g:syntastic_aggregate_errors=1		" run every checker
+let g:syntastic_check_on_wq=0           " don't check when closing buffers
+let g:syntastic_aggregate_errors=1      " run every checker
 let g:syntastic_mode_map = { 'mode': 'passive' }
 
+" vim: set et:sw=4:sts=4