enable lastplace

[etc/vim.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 4e7e3048d958de1cea665fefbe4fd68291319dd9..3ea3e40da710de9055c58d4916126a72066bba63 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


@@ -1441,6 +1441,12 @@ 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
+
+let g:netrw_home="$VARDIR/vim"
+

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


@@ -1468,18 +1474,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
-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>


@@ -1491,57 +1485,39 @@ map Q <Esc>
 let mapleader = ';'
 let maplocalleader = ';'
 
 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
 map <Leader>fs :%s,·, ,g<CR>:nohlsearch<CR>``
 
 " replace fake tab chars with real ones
 map <Leader>ft :%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>sy :call WhatHighlight()<CR>

 
 map <Leader>/ :nohlsearch<CR>
 
 
 map <Leader>/ :nohlsearch<CR>
 

-omap [{ :normal {jj<CR>
-nmap [{ :normal {jj<CR>
-omap ]} :normal }kk<CR>
-nmap ]} :normal }kk<CR>
-
-iab sgf Sehr geehrte Frau
-iab sgh Sehr geehrter Herr
-iab sghn Sehr geehrte Herren
-iab lf Liebe Frau
-iab lh Lieber Herr
-iab sgdh Sehr geehrte Damen und Herren
-iab twimc To Whom It May Concern
-iab lg liebe Grüsse
-iab Lg Liebe Grüsse
-iab fg Freundliche Grüsse
-iab mfg Mit freundlichen Grüssen
-iab mbg Mit den besten Grüssen
-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
+iab <Leader>→ ➬

 
 

-let &cpo=s:cpo_save
-unlet s:cpo_save
+try
+  execute pathogen#infect()
+catch
+  "echo "Pathogen not installed"
+endtry

 
 

-source $HOME/.vim/macros/table.vim
+let g:is_posix = 1

 
 

-let g:SuperTabMappingForward = '<nul>'
-let g:SuperTabMappingBackward = '<s-nul>'
+let g:ycm_add_preview_to_completeopt="popup"
+let g:ycm_autoclose_preview_window_after_completion = 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