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

diff --git a/vimrc b/vimrc
index 7223677..d0371b5 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.
@@ -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
 
@@ -190,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>
@@ -303,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