Merge commit '882d8795c6ff65c02f2657e596391748d1b6b7f5'

[etc/vim.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 89e06d2e9bf7bdbbae5197cfacfb4cd2ac923fac..92f925f91fe19afaa31c5b69d27b4a3757ae11b3 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+)[\]:.)}\t/-]\s|[-\*.·→+]\s)\s*'
+let &flp='^\v\s*(((#|\a|\d{,4}|[ivx]{,4})[]:.)}/])+|[-\*.·→+])\s+'

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


@@ -1445,13 +1445,16 @@ 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
 filetype plugin indent on
 syntax on

-colorscheme madduck

 
 " leave the w mark whenever a file is written
 autocmd BufWrite * normal mw
 
 
 " 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
 " leave the i mark whenever we go idle (after updatetime)
 "augroup markidle
   "autocmd CursorHold * normal mi


@@ -1470,14 +1473,6 @@ augroup tsperrorinsert
   autocmd InsertLeave * match Error /\s\+$/
 augroup end
 
   autocmd InsertLeave * match Error /\s\+$/
 augroup end
 

-" treat wrapped lines normally
-nnoremap k gk
-nnoremap <Up> gk
-inoremap <Up> <C-\><C-o>gk
-nnoremap j gj
-nnoremap <Down> gj
-inoremap <Down> <C-\><C-o>gj
-

 " this isn't windows, screw the F1->help key
 map <F1> <Esc>
 imap <F1> <Esc>
 " this isn't windows, screw the F1->help key
 map <F1> <Esc>
 imap <F1> <Esc>


@@ -1494,14 +1489,15 @@ map <Leader>ft :%s,⇝·*,      ,g<CR>:nohlsearch<CR>``
 " replace fake spaces with real ones
 map <Leader>fs :%s,·, ,g<CR>:nohlsearch<CR>``
 
 " replace fake spaces with real ones
 map <Leader>fs :%s,·, ,g<CR>:nohlsearch<CR>``
 

-map <Leader>sy :echo synIDattr(synID(line("."), col("."), 1), "name")<CR>
+function WhatHighlight()
+  echon 'hi<' . synIDattr(synID(line('.'),col('.'),1),'name') . '> '
+  echon 'trans<' . synIDattr(synID(line('.'),col('.'),0),'name') . '> '
+  echon 'lo<' . synIDattr(synIDtrans(synID(line('.'),col('.'),1)),'name') . '>'
+endfunction

 
 

-map <Leader>/ :nohlsearch<CR>
+map <Leader>sy :call WhatHighlight()<CR>

 
 

-omap [{ :normal {jj<CR>
-nmap [{ :normal {jj<CR>
-omap ]} :normal }kk<CR>
-nmap ]} :normal }kk<CR>
+map <Leader>/ :nohlsearch<CR>

 
 iab sgf Sehr geehrte Frau
 iab sgh Sehr geehrter Herr
 
 iab sgf Sehr geehrte Frau
 iab sgh Sehr geehrter Herr


@@ -1519,10 +1515,34 @@ 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 mhg Mit herzlichen Grüssen
 iab mbbg Mit bundesbrüderlichen Grüssen
 iab mvbg Mit verbandsbrüderlichen Grüssen

+iab dallarmi Dall'Armi-Strasse
+iab muc5 80538 München
+iab muc6 80638 München

 
 

-execute pathogen#infect()
+iab <Leader>→ ➬
+
+try
+  execute pathogen#infect()
+catch
+  "echo "Pathogen not installed"
+endtry
+
+set background=light
+let g:artesanal_dimmed = 1
+let g:artesanal_transparent = 1
+colorscheme artesanal

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

+let g:ycm_add_preview_to_completeopt="popup"
+let g:ycm_autoclose_preview_window_after_completion = 1
+
+let g:UltiSnipsExpandTrigger = "<leader><tab>"
+let g:UltiSnipsJumpForwardTrigger = "<c-]>"
+let g:UltiSnipsJumpBackwardTrigger = "<c-[>"
+let g:UltiSnipsListSnippets = "<leader>q"
+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