X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/722c98341ccc6f3b0e0afc2e12c665fafaed32fb..b28fb7f7dedafd5076e3826c68f08c2e3285afd2:/.vimrc

diff --git a/.vimrc b/.vimrc
index 4e56c98..6d58d6a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -40,15 +40,11 @@ set pt=<F2>
 
 " runtimepath
 " list of directories used for runtime files and plugins
-"       set rtp=/home/madduck/.vim,/usr/share/vim/vimfiles,/usr/share/vim/vim71,/usr/share/vim/vimfiles/after,/home/madduck/.vim/after
-set rtp-=~/.vim
-set rtp-=~/.vim/after
-set rtp^=~/.etc/vim
-set rtp+=~/.etc/vim/after
+"       set rtp=/home/madduck/.vim,/usr/share/vim/vimfiles,/usr/share/vim/vimcurrent,/usr/share/vim/vimfiles/after,/home/madduck/.vim/after
 
 " helpfile
 " name of the main help file
-"       set hf=/usr/share/vim/vim71/doc/help.txt
+"       set hf=/usr/share/vim/vimcurrent/doc/help.txt
 
 """ moving around, searching and patterns
 
@@ -854,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('patch135')
+  set pi
+endif
 
 " lisp
 " enable lisp mode
@@ -1470,9 +1469,9 @@ map j gj
 map <Down> 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>