From: martin f. krafft <madduck@madduck.net>
Date: Sun, 1 Mar 2009 17:36:51 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/vim
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/43b64aa1892957ed30d2e820a2e1e4f63b32cf47?hp=020f4abbf7b7c14013e059f9a2ff11f667a85148

Merge branch 'master' of ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/vim
---

diff --git a/.vim/ftplugin/mail.vim b/.vim/ftplugin/mail.vim
index e716413..87e913c 100644
--- a/.vim/ftplugin/mail.vim
+++ b/.vim/ftplugin/mail.vim
@@ -74,8 +74,10 @@ set completefunc=LBDBCompleteFn
 
 " And this magic by James Vega, which ensures that we only complete with lbdb
 " on the recipient lines of the mail header.
-ino <expr> <C-n> DelegateCompletion(1)
-ino <expr> <C-p> DelegateCompletion(0)
+inoremap <expr> <C-n> DelegateCompletion(1)
+inoremap <expr> <Tab> DelegateCompletion(1)
+inoremap <expr> <C-p> DelegateCompletion(0)
+inoremap <expr> <S-Tab> DelegateCompletion(0)
 
 fun! DelegateCompletion(next)
   if getline('.') =~? '^\%(To\|B\=Cc\):'
diff --git a/.vimrc b/.vimrc
index 779375b..176cf78 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1514,3 +1514,6 @@ let &cpo=s:cpo_save
 unlet s:cpo_save
 
 source $HOME/.vim/macros/table.vim
+
+let g:SuperTabMappingForward = '<nul>'
+let g:SuperTabMappingBackward = '<s-nul>'