fix numbered line formatting

[etc/vim.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 3ae57929f7ba398594bc94422cbdf81beade8c2d..b20d808a36a18d3ac35942cefb9c73466b6ada50 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+)[]:.)}/-])+|[-\*.·→+])\s+'

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


@@ -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


@@ -1448,6 +1452,8 @@ 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


@@ -1466,10 +1472,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


@@ -1489,10 +1491,6 @@ 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
 " replace fake tab chars with real ones
 map <Leader>ft :%s,⇝·*,     ,g<CR>:nohlsearch<CR>``
 " replace fake spaces with real ones


@@ -1523,23 +1521,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 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 g:is_posix = 1

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