From add78dd0267a26936a964ea08eb0e1515457b90a Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 29 Nov 2018 20:07:09 +1300
Subject: Clear away stock ft=mail quoting maps

---
 vim/after/ftplugin/mail.vim | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/vim/after/ftplugin/mail.vim b/vim/after/ftplugin/mail.vim
index 688ca6eb..d93b230e 100644
--- a/vim/after/ftplugin/mail.vim
+++ b/vim/after/ftplugin/mail.vim
@@ -41,6 +41,13 @@ if exists('g:no_plugin_maps') || exists('g:no_mail_maps')
   finish
 endif
 
+" Clear away the quoting maps that the stock mail.vim sets; they work fine,
+" but we have nicer ones to define shortly
+nunmap <buffer> <LocalLeader>q
+vunmap <buffer> <LocalLeader>q
+nunmap <buffer> <Plug>MailQuote
+vunmap <buffer> <Plug>MailQuote
+
 " Flag messages as important/unimportant
 nnoremap <buffer> <LocalLeader>h
       \ :<C-U>call mail#FlagImportant()<CR>
-- 
cgit v1.2.3


From dc59d7e74635f9a56fef9049e34411d6ef535650 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 29 Nov 2018 23:26:52 +1300
Subject: Remove boilerplate after/ftplugin load guards

I'm likely going to move away from Vim 6.0 support, at least for all of
this filetype stuff.

We will keep the one filetype load guard we actually need, which is the
HTML one, to stop plugins like markdown.vim from loading it.
---
 vim/after/ftplugin/mail.vim | 5 -----
 1 file changed, 5 deletions(-)

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

diff --git a/vim/after/ftplugin/mail.vim b/vim/after/ftplugin/mail.vim
index d93b230e..e8b64164 100644
--- a/vim/after/ftplugin/mail.vim
+++ b/vim/after/ftplugin/mail.vim
@@ -1,8 +1,3 @@
-" Extra configuration for mail messages
-if &filetype !=# 'mail' || &compatible || v:version < 700
-  finish
-endif
-
 " If something hasn't already moved the cursor, we'll move to an optimal point
 " to start writing
 if line('.') == 1 && col('.') == 1
-- 
cgit v1.2.3


From 5f1f5b9de3d9ab80a0b5ecef4559b88990f42f4a Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 29 Nov 2018 23:29:09 +1300
Subject: Remove double-key mapping shortcuts

I never use these anyway; I'm firmly in the habit of using underscores
to represent the current line these days.
---
 vim/after/ftplugin/mail.vim | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/vim/after/ftplugin/mail.vim b/vim/after/ftplugin/mail.vim
index e8b64164..74ec1699 100644
--- a/vim/after/ftplugin/mail.vim
+++ b/vim/after/ftplugin/mail.vim
@@ -54,8 +54,6 @@ let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>l'
 " Quote operator
 nnoremap <buffer> <expr> <LocalLeader>q
       \ quote#Quote()
-nnoremap <buffer> <expr> <LocalLeader>qq
-      \ quote#Quote().'_'
 xnoremap <buffer> <expr> <LocalLeader>q
       \ quote#Quote()
 let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>q'
@@ -65,8 +63,6 @@ let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>q'
 " Quote operator with reformatting
 nnoremap <buffer> <expr> <LocalLeader>Q
       \ quote#QuoteReformat()
-nnoremap <buffer> <expr> <LocalLeader>QQ
-      \ quote#QuoteReformat().'_'
 xnoremap <buffer> <expr> <LocalLeader>Q
       \ quote#QuoteReformat()
 let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>Q'
-- 
cgit v1.2.3