add puppet syntax stuff

[etc/vim.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index e971bef487df45bce8698c8fac2abdf01f79a9d8..a38f61ba9cf0abb261b51d51bc29173a00d13f08 100644 (file)
--- 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
@@ -850,7 +850,10 @@ set ci
 " Preserve kind of whitespace when changing indent
 "       (local to buffer)
 "       set nopi        pi
-set pi
+""" set pi this ABORTS < 1:7.1-135+1 (see #446268)
+if has('patch073')
+  set pi
+endif
 
 " lisp
 " enable lisp mode
@@ -1086,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
@@ -1131,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
@@ -1412,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
@@ -1460,23 +1463,37 @@ 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>
-"imap <F1> <Esc>
-"vmap <F1> <Esc>
+map <F1> <Esc>
+imap <F1> <Esc>
+vmap <F1> <Esc>
 
 " ignore Q -- Ex mode
 map Q <Esc>
 
+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>``
+
+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