encapsulate local settings in cpo

diff --git a/.vimrc b/.vimrc
index 3ae57929f7ba398594bc94422cbdf81beade8c2d..91a3b66500a80e65adb4b83a2d4ade603cf01720 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=
 
 " 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
 filetype plugin indent on
 syntax on
 colorscheme madduck


@@ -1466,10 +1470,6 @@ augroup tsperrorinsert
   autocmd InsertLeave * match Error /\s\+$/
 augroup end
 
   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
 " treat wrapped lines normally
 nnoremap k gk
 nnoremap <Up> gk


@@ -1534,6 +1534,8 @@ iab mk Martin Krafft
 iab mfk Martin F. Krafft
 iab addr Hanfstaenglstraße 15\rD–80638 München
 
 iab mfk Martin F. Krafft
 iab addr Hanfstaenglstraße 15\rD–80638 München
 

+let g:is_posix = 1
+

 let &cpo=s:cpo_save
 unlet s:cpo_save
 
 let &cpo=s:cpo_save
 unlet s:cpo_save
 


@@ -1541,5 +1543,3 @@ source $HOME/.vim/macros/table.vim
 
 let g:SuperTabMappingForward = '<nul>'
 let g:SuperTabMappingBackward = '<s-nul>'
 
 let g:SuperTabMappingForward = '<nul>'
 let g:SuperTabMappingBackward = '<s-nul>'

-
-let g:is_posix = 1