move lbdbq package to mail ftplugin

[etc/vim.git] / .vim / ftplugin / mail.vim

diff --git a/.vim/ftplugin/mail.vim b/.vim/ftplugin/mail.vim
index 67bd38c4415853ef6bb9264bc86254bf7adf5f28..cdecab22df2f60a93e7f0cc4bee880f771436f54 100644 (file)
--- a/.vim/ftplugin/mail.vim
+++ b/.vim/ftplugin/mail.vim
@@ -1,3 +1,4 @@
+<<<<<<< HEAD

 setlocal textwidth=68
 setlocal formatoptions-=o
 setlocal formatoptions-=r
 setlocal textwidth=68
 setlocal formatoptions-=o
 setlocal formatoptions-=r


@@ -156,6 +157,8 @@ map <Leader>ns 1G/^Subject: /<CR>:s,\(Subject: \)\(Re: \)*\(.*\)$,\1 (was: \3),<
 " http://strcat.de/wiki/dotfiles#vim
 map <Leader>dw 1G/^Subject: /<CR>:s, *(was: .*)$<CR>:set nohls<CR>f l
 
 " http://strcat.de/wiki/dotfiles#vim
 map <Leader>dw 1G/^Subject: /<CR>:s, *(was: .*)$<CR>:set nohls<CR>f l
 

+packadd lbdbq
+

 " http://dollyfish.net.nz/blog/2008-04-01/mutt-and-vim-custom-autocompletion
 fun! LBDBCompleteFn(findstart, base)
   let line = getline('.')
 " http://dollyfish.net.nz/blog/2008-04-01/mutt-and-vim-custom-autocompletion
 fun! LBDBCompleteFn(findstart, base)
   let line = getline('.')


@@ -214,3 +217,6 @@ autocmd BufWritePre <buffer> call WriteMailBackup()
 
 let g:markdown_in_mail = 1
 runtime! ftplugin/markdown.vim
 
 let g:markdown_in_mail = 1
 runtime! ftplugin/markdown.vim

+=======
+packadd! lbdbq
+>>>>>>> 733463ee (move lbdbq package to mail ftplugin)