Merge branch 'master' of ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/vim

[etc/vim.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index a361aa987baee86034f8d7940d45aa422f7854f6..4f498dc79715ede171fb767ad616543af1ffa34f 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=
-set ww=b,s,[,],~
+set ww=b,s,[,<,>,],~
 
 " 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
-set linebreak
+" does not work with autocmd set list/nolist below
 
 " breakat
 " which characters might cause a line break
@@ -1089,7 +1089,7 @@ set ar
 " 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
@@ -1134,7 +1134,7 @@ set hi=100
 " wildmode
 " specifies how command line completion works
 "       set wim=full
-set wim=list
+set wim=list:full
 
 " suffixes
 " list of file name extensions that have a lower priority
@@ -1415,12 +1415,12 @@ set secure
 " viewdir
 " directory where to store files with :mkview
 "       set vdir=/home/madduck/.vim/view
-set vdir=$VAR/vim/view
+set vdir=$VARDIR/vim/view
 
 " viminfo
 " list that specifies what to write in the viminfo file
 "       set vi=
-set vi='1000,f1,\"1000,:20,/20,%,!,h,n$VAR/vim/viminfo
+set vi='1000,f1,\"1000,:20,/20,%,!,h,n$VARDIR/vim/viminfo
 
 " bufhidden
 " what happens with a buffer when it's no longer in a window
@@ -1448,10 +1448,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
 
-" 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
 
@@ -1467,10 +1463,12 @@ let s:cpo_save=&cpo
 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>
@@ -1513,3 +1511,5 @@ iab vld Vielen lieben Dank
 
 let &cpo=s:cpo_save
 unlet s:cpo_save
+
+source $HOME/.vim/macros/table.vim