X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=caa7a023883d0dc0ad2a0ac23e33b53caa260ab1;hb=625d3ec4b88565adf112bc907e027f38ceca13b2;hp=c3ababe711bb54e8c66dfddf019d0f9995cb008d;hpb=550fbc99ccb3214cee3e80e82e011c04ae565b1c;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index c3ababe..caa7a02 100644
--- a/vimrc
+++ b/vimrc
@@ -13,12 +13,16 @@ endif
 
 " Save 'runtimepath' in case it was changed by the system's configuration
 " files.
-let s:save_runtimepath = &runtimepath
-" Reset all options (except 'term, 'lines' and 'columns'). This makes sure a
+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.
-let &runtimepath = s:save_runtimepath
+if has('eval')
+    let &runtimepath = s:save_runtimepath
+endif
 
 " Make sure Vim (and not Vi) settings are used.
 set nocompatible
@@ -173,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>
@@ -183,11 +190,25 @@ 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>
 nnoremap - <C-b>
 
+" Go to next and previous buffer. Thanks to elik in #vim on Freenode
+" (2010-05-16 18:38) for this idea.
+nnoremap <silent> gb :bnext<CR>
+nnoremap <silent> gB :bprev<CR>
+
 " Fast access to buffers.
 nnoremap <Leader>1 :1b<CR>
 nnoremap <Leader>2 :2b<CR>
@@ -296,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