cleaned up mail ft plugin, disabled some mailplate profiles and bought back non to...

diff --git a/.vim/ftplugin/mail.vim b/.vim/ftplugin/mail.vim
index 516d1b55b2626cb2ba73eb17f546123a540d2d7d..1f0fe553a87c25bcef6dace3a2c095777b5e7259 100644 (file)
--- a/.vim/ftplugin/mail.vim
+++ b/.vim/ftplugin/mail.vim
@@ -36,24 +36,24 @@ ino <C-p> <C-X><C-U>
 
 " 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)
-"
-"fun! DelegateCompletion(next)
-"  if getline('.') =~? '^\%(To\|B\=Cc\):'
-"    return "\x18\x15"
-"  elseif a:next
-"    return "\x0e"
-"  else
-"    return "\x10"
-"  endif
-"endfun
+ino <expr> <C-n> DelegateCompletion(1)
+ino <expr> <C-p> DelegateCompletion(0)
+
+fun! DelegateCompletion(next)
+  if getline('.') =~? '^\%(To\|B\=Cc\):'
+    return "\x18\x15"
+  elseif a:next
+    return "\x0e"
+  else
+    return "\x10"
+  endif
+endfun
 
 nmap <buffer> <C-P>1 :w<CR>:%!mailplate --keep-unknown --auto<CR>
-nmap <buffer> <C-P>3 :w<CR>:%!mailplate --keep-unknown mjollnir<CR>
 nmap <buffer> <C-P>2 :w<CR>:%!mailplate --keep-unknown sgn<CR>
-nmap <buffer> <C-P>4 :w<CR>:%!mailplate --keep-unknown catalyst<CR>
-nmap <buffer> <C-P>5 :w<CR>:%!mailplate --keep-unknown mahara<CR>
-nmap <buffer> <C-P>6 :w<CR>:%!mailplate --keep-unknown liip<CR>
-nmap <buffer> <C-P>7 :w<CR>:%!mailplate --keep-unknown gmail<CR>
+nmap <buffer> <C-P>3 :w<CR>:%!mailplate --keep-unknown mjollnir<CR>
+nmap <buffer> <C-P>4 :w<CR>:%!mailplate --keep-unknown gmail<CR>
+"nmap <buffer> <C-P>4 :w<CR>:%!mailplate --keep-unknown catalyst<CR>
+"nmap <buffer> <C-P>5 :w<CR>:%!mailplate --keep-unknown mahara<CR>
+"nmap <buffer> <C-P>6 :w<CR>:%!mailplate --keep-unknown liip<CR>