Merge remote branch 'rammstein/master'

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index e6a716e35f5b00bf336726f40d94f670b16fd108..b0665efb553d9ce198950d1fcc9884fbc8a893cb 100644 (file)
--- 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.
@@ -43,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
 
@@ -204,6 +209,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 +322,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