move all mail ftplugin stuff to after

diff --git a/.vim/after/ftplugin/mail.vim b/.vim/after/ftplugin/mail.vim
index 35abab175ab021da6d5822b5ef3dfb0cfa38d823..16157a96d702ea826685f2001924c68dc5b583b7 100644 (file)
--- a/.vim/after/ftplugin/mail.vim
+++ b/.vim/after/ftplugin/mail.vim
@@ -100,3 +100,71 @@ augroup listinsert
   au!
 augroup END
 set nolist
+
+nmap <buffer> <C-P><F1> :w<CR>:%!mailplate --keep-unknown official<CR>
+nmap <buffer> <C-P><F2> :w<CR>:%!mailplate --keep-unknown tahi<CR>
+nmap <buffer> <C-P><F3> :w<CR>:%!mailplate --keep-unknown pmvm<CR>
+nmap <buffer> <C-P><F4> :w<CR>:%!mailplate --keep-unknown pobox<CR>
+nmap <buffer> <C-P><F5> :w<CR>:%!mailplate --keep-unknown debian<CR>
+nmap <buffer> <C-P><F6> :w<CR>:%!mailplate --keep-unknown debconf<CR>
+nmap <buffer> <C-P><F7> :w<CR>:%!mailplate --keep-unknown uniwh<CR>
+nmap <buffer> <C-P><F8> :w<CR>:%!mailplate --keep-unknown mtfk<CR>
+nmap <buffer> <C-P><F9> :w<CR>:%!mailplate --keep-unknown sudetia<CR>
+nmap <buffer> <C-P><F12> :w<CR>:%!mailplate --keep-unknown private<CR>
+nmap <buffer> <F1> :w<CR>:%!mailplate --auto --keep-unknown 2>/dev/null<CR>
+
+" change subject line
+" Before: Subject: old
+" After : Subject: New (was: old)
+" http://strcat.de/wiki/dotfiles#vim
+" map ,sw 1G/^Subject: <CR>:s/Re:/was:/<CR>Wi (<C-O>$)<ESC>0Whi
+map <Leader>ns 1G/^Subject: /<CR>:s,\(Subject: \)\(Re: \)*\(.*\)$,\1 (was: \3),<CR>:set nohls<CR>f li
+
+" Delete 'was' in the Subject.
+" Before: Subject: New (was: old)
+" After : Subject: New
+" http://strcat.de/wiki/dotfiles#vim
+map <Leader>dw 1G/^Subject: /<CR>:s, *(was: .*)$<CR>:set nohls<CR>f l
+
+" http://dollyfish.net.nz/blog/2008-04-01/mutt-and-vim-custom-autocompletion
+fun! LBDBCompleteFn(findstart, base)
+  let line = getline('.')
+  if a:findstart
+    " locate the start of the word
+    let start = col('.') - 1
+    while start > 0 && line[start - 1] =~ '[^:,]'
+      let start -= 1
+    endwhile
+    while start < col('.') && line[start] =~ '[:, ]'
+      let start += 1
+    endwhile
+    return start
+  else
+    let res = []
+    let query = substitute(a:base, '"', '', 'g')
+    let query = substitute(query, '\s*<.*>\s*', '', 'g')
+    for m in LbdbQuery(query)
+      call complete_add(printf('"%s" <%s>', escape(m[0], '"'), m[1]))
+      if complete_check()
+        break
+      endif
+    endfor
+    return res
+  endif
+endfun
+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.
+inoremap <expr> <C-n> DelegateCompletion(1)
+inoremap <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

diff --git a/.vim/ftplugin/mail.vim b/.vim/ftplugin/mail.vim
deleted file mode 100644 (file)
index 0431526..0000000
--- a/.vim/ftplugin/mail.vim
+++ /dev/null
@@ -1,67 +0,0 @@
-nmap <buffer> <C-P><F1> :w<CR>:%!mailplate --keep-unknown official<CR>
-nmap <buffer> <C-P><F2> :w<CR>:%!mailplate --keep-unknown tahi<CR>
-nmap <buffer> <C-P><F3> :w<CR>:%!mailplate --keep-unknown pmvm<CR>
-nmap <buffer> <C-P><F4> :w<CR>:%!mailplate --keep-unknown pobox<CR>
-nmap <buffer> <C-P><F5> :w<CR>:%!mailplate --keep-unknown debian<CR>
-nmap <buffer> <C-P><F6> :w<CR>:%!mailplate --keep-unknown debconf<CR>
-nmap <buffer> <C-P><F7> :w<CR>:%!mailplate --keep-unknown uniwh<CR>
-nmap <buffer> <C-P><F8> :w<CR>:%!mailplate --keep-unknown mtfk<CR>
-nmap <buffer> <C-P><F9> :w<CR>:%!mailplate --keep-unknown sudetia<CR>
-nmap <buffer> <C-P><F12> :w<CR>:%!mailplate --keep-unknown private<CR>
-nmap <buffer> <F1> :w<CR>:%!mailplate --auto --keep-unknown 2>/dev/null<CR>
-
-" change subject line
-" Before: Subject: old
-" After : Subject: New (was: old)
-" http://strcat.de/wiki/dotfiles#vim
-" map ,sw 1G/^Subject: <CR>:s/Re:/was:/<CR>Wi (<C-O>$)<ESC>0Whi
-map <Leader>ns 1G/^Subject: /<CR>:s,\(Subject: \)\(Re: \)*\(.*\)$,\1 (was: \3),<CR>:set nohls<CR>f li
-
-" Delete 'was' in the Subject.
-" Before: Subject: New (was: old)
-" After : Subject: New
-" http://strcat.de/wiki/dotfiles#vim
-map <Leader>dw 1G/^Subject: /<CR>:s, *(was: .*)$<CR>:set nohls<CR>f l
-
-" http://dollyfish.net.nz/blog/2008-04-01/mutt-and-vim-custom-autocompletion
-fun! LBDBCompleteFn(findstart, base)
-  let line = getline('.')
-  if a:findstart
-    " locate the start of the word
-    let start = col('.') - 1
-    while start > 0 && line[start - 1] =~ '[^:,]'
-      let start -= 1
-    endwhile
-    while start < col('.') && line[start] =~ '[:, ]'
-      let start += 1
-    endwhile
-    return start
-  else
-    let res = []
-    let query = substitute(a:base, '"', '', 'g')
-    let query = substitute(query, '\s*<.*>\s*', '', 'g')
-    for m in LbdbQuery(query)
-      call complete_add(printf('"%s" <%s>', escape(m[0], '"'), m[1]))
-      if complete_check()
-        break
-      endif
-    endfor
-    return res
-  endif
-endfun
-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.
-inoremap <expr> <C-n> DelegateCompletion(1)
-inoremap <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