From: martin f. krafft <madduck@madduck.net>
Date: Tue, 8 Apr 2025 12:20:58 +0000 (+0200)
Subject: move lbdbq package to mail ftplugin
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/99f66e8ca7fb7588025d47ed817dbc049018a7ef?ds=sidebyside

move lbdbq package to mail ftplugin
---

diff --git a/.vim/ftplugin/mail.vim b/.vim/ftplugin/mail.vim
index 67bd38c4..cdecab22 100644
--- a/.vim/ftplugin/mail.vim
+++ b/.vim/ftplugin/mail.vim
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 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
 
+packadd lbdbq
+
 " 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
+=======
+packadd! lbdbq
+>>>>>>> 733463ee (move lbdbq package to mail ftplugin)
diff --git a/.vim/plugin/lbdbq.vim b/.vim/plugin/lbdbq.vim
deleted file mode 120000
index fe7dff2a..00000000
--- a/.vim/plugin/lbdbq.vim
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/vim-scripts/lbdbq/plugin/lbdbq.vim
\ No newline at end of file