enable airline

[etc/vim.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 4e7e3048d958de1cea665fefbe4fd68291319dd9..ca1884cff64d14408623182c97a77bb546ed12fa 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -1441,6 +1441,10 @@ set vi=<1000,'1000,\"1000,:100,/100,@100,f1,%,!,h,n$VARDIR/vim/viminfo
 " set to "msg" to see all error messages
 "       set debug=
 
+if &cp | set nocp | endif
+let s:cpo_save=&cpo
+set cpo&vim
+
 filetype plugin indent on
 syntax on
 colorscheme madduck
@@ -1448,8 +1452,6 @@ colorscheme madduck
 " leave the w mark whenever a file is written
 autocmd BufWrite * normal mw
 
-autocmd BufRead *.vcf set filetype=vcard
-
 " leave the i mark whenever we go idle (after updatetime)
 "augroup markidle
   "autocmd CursorHold * normal mi
@@ -1468,10 +1470,6 @@ augroup tsperrorinsert
   autocmd InsertLeave * match Error /\s\+$/
 augroup end
 
-if &cp | set nocp | endif
-let s:cpo_save=&cpo
-set cpo&vim
-
 " treat wrapped lines normally
 nnoremap k gk
 nnoremap <Up> gk
@@ -1491,10 +1489,6 @@ map Q <Esc>
 let mapleader = ';'
 let maplocalleader = ';'
 
-imap <Leader>-- –
-imap <Leader>--- —
-imap <Leader>... …
-
 " replace fake tab chars with real ones
 map <Leader>ft :%s,⇝·*,     ,g<CR>:nohlsearch<CR>``
 " replace fake spaces with real ones
@@ -1525,23 +1519,12 @@ iab hg Herzliche Grüsse
 iab mhg Mit herzlichen Grüssen
 iab mbbg Mit bundesbrüderlichen Grüssen
 iab mvbg Mit verbandsbrüderlichen Grüssen
-iab vd Vielen Dank
-iab vld Vielen lieben Dank
-iab vhd Vielen herzlichen Dank
-iab email e-mail
-iab emails e-mails
-iab Email E-mail
-iab Emails E-mails
-iab mk Martin Krafft
-iab mfk Martin F. Krafft
-iab addr Hanfstaenglstraße 15\rD–80638 München
-
-let &cpo=s:cpo_save
-unlet s:cpo_save
 
-source $HOME/.vim/macros/table.vim
+let g:airline_theme='minimalist'
 
-let g:SuperTabMappingForward = '<nul>'
-let g:SuperTabMappingBackward = '<s-nul>'
+execute pathogen#infect()
 
 let g:is_posix = 1
+
+let &cpo=s:cpo_save
+unlet s:cpo_save