disable supertab by default, enable it only for mail

[etc/vim.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 28ca20101540381f97da213147e2fb8e3b0d60b8..176cf78195cdeadea563c275c9f700251b177a2a 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -52,7 +52,7 @@ set pt=<F2>
 " list of flags specifying which commands wrap to another line
 "       (local to window)
 "       set ww=
 " list of flags specifying which commands wrap to another line
 "       (local to window)
 "       set ww=

-set ww=b,s,[,],~
+set ww=b,s,[,<,>,],~

 
 " startofline
 " many jump commands move the cursor to the first non-blank
 
 " startofline
 " many jump commands move the cursor to the first non-blank


@@ -195,7 +195,7 @@ set nowrap
 " wrap long lines at a character in 'breakat'
 "       (local to window)
 "       set nolbr       lbr
 " wrap long lines at a character in 'breakat'
 "       (local to window)
 "       set nolbr       lbr

-set linebreak
+" does not work with autocmd set list/nolist below

 
 " breakat
 " which characters might cause a line break
 
 " breakat
 " which characters might cause a line break


@@ -673,6 +673,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*

+set flp=^\\s*\\d\\+[\\]:.)}]\\s*

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


@@ -879,7 +880,6 @@ endif
 " foldlevelstart
 " value for 'foldlevel' when starting to edit a file
 "       set fdls=-1
 " foldlevelstart
 " value for 'foldlevel' when starting to edit a file
 "       set fdls=-1

-set fdls=1

 
 " foldcolumn
 " width of the column used to indicate folds
 
 " foldcolumn
 " width of the column used to indicate folds


@@ -912,6 +912,7 @@ set fdls=1
 " folding type: "manual", "indent", "expr", "marker" or "syntax"
 "       (local to window)
 "       set fdm=manual
 " folding type: "manual", "indent", "expr", "marker" or "syntax"
 "       (local to window)
 "       set fdm=manual

+set fdm=marker

 
 " foldexpr
 " expression used when 'foldmethod' is "expr"
 
 " foldexpr
 " expression used when 'foldmethod' is "expr"


@@ -1089,7 +1090,7 @@ set ar
 " directory
 " list of directories for the swap file
 "       set dir=.,/home/madduck/tmp,/var/tmp,/tmp
 " directory
 " list of directories for the swap file
 "       set dir=.,/home/madduck/tmp,/var/tmp,/tmp

-set dir=.,~/tmp//,/var/tmp//,/tmp//
+set dir=.,$TMPDIR//,/var/tmp//,/tmp//

 
 " swapfile
 " use a swap file for this buffer
 
 " swapfile
 " use a swap file for this buffer


@@ -1448,10 +1449,6 @@ colorscheme madduck
 autocmd BufNewFile,BufRead /etc/logcheck/*.d*/* set tw=0
 autocmd BufNewFile,BufRead /home/madduck/debian/pkg/logcheck/*/rulefiles/linux/*.d*/* set tw=0
 
 autocmd BufNewFile,BufRead /etc/logcheck/*.d*/* set tw=0
 autocmd BufNewFile,BufRead /home/madduck/debian/pkg/logcheck/*/rulefiles/linux/*.d*/* set tw=0
 

-" display the git-diff --cached in window below commit
-" assumes nosplitbelow set. Might want to use wincmd p otherwise
-autocmd FileType gitcommit DiffGitCached | wincmd J
-

 " jump to last known position in file (:he last-position-jump)
 autocmd BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"zz" | endif
 
 " jump to last known position in file (:he last-position-jump)
 autocmd BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"zz" | endif
 


@@ -1467,10 +1464,12 @@ let s:cpo_save=&cpo
 set cpo&vim
 
 " treat wrapped lines normally
 set cpo&vim
 
 " treat wrapped lines normally

-map k gk
-map <Up> gk
-map j gj
-map <Down> gj
+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>
 
 " this isn't windows, screw the F1->help key
 map <F1> <Esc>


@@ -1513,3 +1512,8 @@ iab vld Vielen lieben Dank
 
 let &cpo=s:cpo_save
 unlet s:cpo_save
 
 let &cpo=s:cpo_save
 unlet s:cpo_save

+
+source $HOME/.vim/macros/table.vim
+
+let g:SuperTabMappingForward = '<nul>'
+let g:SuperTabMappingBackward = '<s-nul>'