Merge remote branch 'rammstein/master'

diff --git a/vim/after/ftplugin/mail.vim b/vim/after/ftplugin/mail.vim
index 3005e25332f509ece6bf16c556c21ad534661f0a..2dc85d828a4ef1fb9fbddb22fd89b61b53dd3341 100644 (file)
--- a/vim/after/ftplugin/mail.vim
+++ b/vim/after/ftplugin/mail.vim
@@ -1,7 +1,6 @@
 " Vim filetype plugin file
 " Language:     Mail
 " Maintainer:   Simon Ruderich <simon@ruderich.org>
-" Last Change:  2008-12-07
 
 
 " Use only 65 characters per line as given in rfc1855.
@@ -13,7 +12,15 @@ silent! %s/\(^\([a-zA-z-]\+:\|--\)\)\@<!\s\+$//
 " Remove spaces between quotes (> > to >>).
 silent! %s/^\(>\+\) >/\1>/g
 silent! %s/^\(>\+\) >/\1>/g
+silent! %s/^\(>\+\) >/\1>/g
 
 " Move directly after the headers.
 normal gg
 normal }
+
+" Fold quotes. Thanks to Teemu Likonen <tlikonen@iki.fi>
+" (http://permalink.gmane.org/gmane.editors.vim.devel/20890,
+" <20080809190407.GA7584@mithlond.arda.local>) and danielsh_ in #mutt on
+" Freenode (2010-07-10 13:01) for letting me know.
+setlocal foldmethod=expr foldminlines=2
+setlocal foldexpr=strlen(substitute(substitute(getline(v:lnum),'\\s','','g'),'[^>].*','',''))

diff --git a/vimrc b/vimrc
index d0371b559d90896cd8a629b08731fd4c3d5e431c..b0665efb553d9ce198950d1fcc9884fbc8a893cb 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -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>