From 80227fc6263ca864227de8b9d8d9f93f19ad173a Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Wed, 1 Jan 2020 16:08:21 +1300
Subject: Reimplement mail header importance flagging

Just for fun, write something a little more comprehensive to read in the
entire mail header as a data structure, in order to add or set header
fields correctly.  I don't think this is totally RFC-compliant yet; I'll
need to check.
---
 vim/after/ftplugin/mail.vim | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'vim/after/ftplugin/mail.vim')

diff --git a/vim/after/ftplugin/mail.vim b/vim/after/ftplugin/mail.vim
index f81be691..dbb2f7c5 100644
--- a/vim/after/ftplugin/mail.vim
+++ b/vim/after/ftplugin/mail.vim
@@ -9,10 +9,14 @@ let b:undo_ftplugin .= '|delcommand SuggestStart'
 SuggestStart
 
 " Normalise quoting
-command -buffer -bar -range=% StrictQuote
+command -bar -buffer -range=% StrictQuote
       \ call mail#StrictQuote(<q-line1>, <q-line2>)
 let b:undo_ftplugin .= '|delcommand StrictQuote'
 
+command -bar -buffer -nargs=1 SetImportance
+      \ call mail#importance#Set(<f-args>)
+let b:undo_ftplugin .= '|delcommand SetImportance'
+
 " Add a space to the end of wrapped lines for format-flowed mail
 setlocal formatoptions+=w
 let b:undo_ftplugin .= '|setlocal formatoptions<'
@@ -35,12 +39,15 @@ if exists('no_plugin_maps') || exists('no_mail_maps')
 endif
 
 " Flag messages as important/unimportant
-nnoremap <buffer> <LocalLeader>h
-      \ :<C-U>call mail#FlagImportant()<CR>
+nnoremap <buffer> <LocalLeader>ih
+      \ :<C-U>SetImportance high<CR>
 let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>h'
-nnoremap <buffer> <LocalLeader>l
-      \ :<C-U>call mail#FlagUnimportant()<CR>
+nnoremap <buffer> <LocalLeader>il
+      \ :<C-U>SetImportance low<CR>
 let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>l'
+nnoremap <buffer> <LocalLeader>in
+      \ :<C-U>SetImportance normal<CR>
+let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>n'
 
 " Quote operator
 nnoremap <buffer> <expr> <LocalLeader>q
-- 
cgit v1.2.3