X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/e29b37490e83f6645ae3acae39edffdee5cf7fc6..d0d409c7479f1908422eedfd5e486e129b15a39b:/.vimrc

diff --git a/.vimrc b/.vimrc
index 4651236..a38f61b 100644
--- a/.vimrc
+++ b/.vimrc
@@ -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
@@ -851,7 +851,7 @@ set ci
 "       (local to buffer)
 "       set nopi        pi
 """ set pi this ABORTS < 1:7.1-135+1 (see #446268)
-if has('patch135')
+if has('patch073')
   set pi
 endif
 
@@ -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
@@ -1463,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>
@@ -1486,10 +1488,12 @@ 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>ft :%s,·, ,g<CR>:nohlsearch<CR>``
+map <Leader>fs :%s,·, ,g<CR>:nohlsearch<CR>``
 
 map <Leader>sy :echo synIDattr(synID(line("."), col("."), 1), "name")<CR>
 
+map <Leader>/ :nohlsearch<CR>
+
 iab sgf Sehr geehrte Frau
 iab sgh Sehr geehrter Herr
 iab lf Liebe Frau