configure ultisnips

[etc/vim.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 16de13abc631123fa2e5f7e2a928e716f05908e3..dadfc9ca83c59063a683092b029331daa3896e80 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -670,7 +670,7 @@ set fo=tcroqn1l
 " pattern to recognize a numbered list
 "       (local to buffer)
 "       set flp=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s*
 " pattern to recognize a numbered list
 "       (local to buffer)
 "       set flp=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s*

-let &flp='^\v\s*((\a|\d+)[]:.)}/-]\s|[-\*.·→+]\s)\s*'
+let &flp='^\v\s*(((\a|\d{,4})[]:.)}/])+|[-\*.·→+])\s+'

 
 " formatexpr
 " expression used for "gq" to format lines
 
 " formatexpr
 " expression used for "gq" to format lines


@@ -1445,6 +1445,8 @@ if &cp | set nocp | endif
 let s:cpo_save=&cpo
 set cpo&vim
 
 let s:cpo_save=&cpo
 set cpo&vim
 

+let g:netrw_home="$VARDIR/vim"
+

 filetype plugin indent on
 syntax on
 colorscheme madduck
 filetype plugin indent on
 syntax on
 colorscheme madduck


@@ -1522,11 +1524,23 @@ iab mhg Mit herzlichen Grüssen
 iab mbbg Mit bundesbrüderlichen Grüssen
 iab mvbg Mit verbandsbrüderlichen Grüssen
 
 iab mbbg Mit bundesbrüderlichen Grüssen
 iab mvbg Mit verbandsbrüderlichen Grüssen
 

+iab => ➬
+

 let g:airline_theme='minimalist'
 
 let g:airline_theme='minimalist'
 

-execute pathogen#infect()
+try
+  execute pathogen#infect()
+catch
+  "echo "Pathogen not installed"
+endtry

 
 let g:is_posix = 1
 
 
 let g:is_posix = 1
 

+let g:UltiSnipsExpandTrigger = "<leader><tab>"
+let g:UltiSnipsJumpForwardTrigger = "<c-]>"
+let g:UltiSnipsJumpBackwardTrigger = "<c-[>"
+map <F10> :UltiSnipsEdit<cr>
+imap <F10> <esc>:UltiSnipsEdit<cr>
+

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