aboutsummaryrefslogtreecommitdiff
path: root/vim/after/ftplugin/mail.vim
diff options
context:
space:
mode:
Diffstat (limited to 'vim/after/ftplugin/mail.vim')
-rw-r--r--vim/after/ftplugin/mail.vim16
1 files changed, 7 insertions, 9 deletions
diff --git a/vim/after/ftplugin/mail.vim b/vim/after/ftplugin/mail.vim
index 688ca6eb..74ec1699 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
@@ -41,6 +36,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>
@@ -52,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'
@@ -63,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'