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

diff --git a/vimrc b/vimrc
index e6a716e..caa7a02 100644
--- a/vimrc
+++ b/vimrc
@@ -16,7 +16,7 @@ endif
 if has('eval')
     let s:save_runtimepath = &runtimepath
 endif
-" Reset all options (except 'term, 'lines' and 'columns'). This makes sure a
+" 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.
@@ -204,6 +204,11 @@ cnoremap <C-n> <down>
 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>
@@ -312,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