X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=d0371b559d90896cd8a629b08731fd4c3d5e431c;hb=4f5d6b5591ec3cf2632f88c2e845ca7bf787cd6d;hp=88db35b817f38a9efd94d96853484b53d14bbf96;hpb=dbb6e842cef1cf10bf34784778332abc897f8000;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 88db35b..d0371b5 100644
--- a/vimrc
+++ b/vimrc
@@ -11,9 +11,18 @@ if $HOME == '/root' || exists('$SUDO_USER')
 endif
 
 
-" Reset all options (except 'term, 'lines' and 'columns'). This makes sure a
+" Save 'runtimepath' in case it was changed by the system's configuration
+" files.
+if has('eval')
+    let s:save_runtimepath = &runtimepath
+endif
+" Reset all options (except 'term', 'lines' and 'columns'). This makes sure a
 " system wide configuration file doesn't change default values.
 set all&
+" And restore it after all other options were reset.
+if has('eval')
+    let &runtimepath = s:save_runtimepath
+endif
 
 " Make sure Vim (and not Vi) settings are used.
 set nocompatible
@@ -34,6 +43,11 @@ set nomodeline
 " possible files.
 set wildmode=longest,list
 
+" Use strong encryption if possible, also used for swap/undo files.
+if v:version >= 703
+    set cryptmethod=blowfish
+endif
+
 
 " EDIT SETTINGS
 
@@ -168,6 +182,9 @@ endif
 
 " MAPPINGS (except for plugins, see PLUGIN SETTINGS below)
 
+" Easy way to exit insert mode.
+inoremap jj <Esc>
+
 " Disable arrow keys for all modes except command modes. Thanks to James Vega
 " (http://git.jamessan.com/?p=etc/vim.git;a=summary).
 map <right> <nop>
@@ -178,6 +195,15 @@ imap <right> <nop>
 imap <left>  <nop>
 imap <up>    <nop>
 imap <down>  <nop>
+" Also disable up and down array in command mode, use <C-p>/<C-n> as
+" replacement (see below).
+cmap <up> <nop>
+cmap <down> <nop>
+
+" Use Ctrl-P/Ctrl-N as replacement for <Up>/<Down> in command mode. Thanks to
+" abstrakt and grayw in #vim on Freenode (2010-04-12 21:20).
+cnoremap <C-p> <up>
+cnoremap <C-n> <down>
 
 " Use <space> to move down a page and - to move up one like in mutt.
 nnoremap <Space> <C-f>
@@ -260,6 +286,11 @@ endif
 if has('syntax')
     syntax enable
 
+" Don't highlight more than 200 columns as I normally don't have that long
+" lines and they slow down syntax coloring. Thanks to Derek Wyatt
+" (http://www.derekwyatt.org/vim/the-vimrc-file/).
+    set synmaxcol=200
+
 " Highlight lines longer than 78 characters. Thanks to Tony Mechelynck
 " <antoine.mechelynck@gmail.com> from the Vim mailing list. It can easily be
 " disabled when necessary with :2match (in Vim >= 700).
@@ -286,6 +317,17 @@ endif
 " Map toggle comment.
 map <Leader><Leader> <plug>NERDCommenterToggle
 
+" XPTemplate settings.
+if has('eval')
+    " Try to maintain snippet rendering even after editing outside of a
+    " snippet.
+    let g:xptemplate_strict = 0
+    " Don't complete any braces automatically.
+    let g:xptemplate_brace_complete = 0
+    " Only highlight the current placeholder.
+    let g:xptemplate_highlight = 'current'
+endif
+
 
 " AUTO COMMANDS