X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=0940c45b58ab203cc364c50d5e949de4898ca355;hb=41f073edef5893b4fa03cfb1648f0cc182265e30;hp=acc361f74e54da10b3daf9b41692d963e6761794;hpb=312f46c288d46273109e5a75e391e920a8fce8b0;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index acc361f..0940c45 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
@@ -168,6 +177,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 +190,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>
@@ -291,6 +312,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