From: Simon Ruderich <simon@ruderich.org>
Date: Mon, 13 Sep 2010 15:33:28 +0000 (+0200)
Subject: Merge remote branch 'rammstein/master'
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=f6eefdd7a7a55b306c8c5d0c912609e942acd63d;hp=-c;p=config%2Fdotfiles.git

Merge remote branch 'rammstein/master'
---

f6eefdd7a7a55b306c8c5d0c912609e942acd63d
diff --combined vimrc
index caa7a02,d0371b5..b0665ef
--- a/vimrc
+++ b/vimrc
@@@ -43,6 -43,11 +43,11 @@@ set nomodelin
  " 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,11 -209,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>