diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-11-30 00:09:51 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-11-30 00:09:51 +1300 |
commit | 94816757caac0120df020ea281a8ab020256de21 (patch) | |
tree | 854ae7eb90e67c9d24382018da2594cc9966f840 /vim/after/ftplugin/mail.vim | |
parent | Merge branch 'release/v1.78.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-94816757caac0120df020ea281a8ab020256de21.tar.gz dotfiles-94816757caac0120df020ea281a8ab020256de21.zip |
Merge branch 'release/v2.0.0'v2.0.0
* release/v2.0.0:
Update make_target.vim to v1.2.0
Comment conditional set of <Plug>(InsertCancel)
Require Vim 7 for filetype and syntax highlights
Simplify a load guard for sh.vim syntax tweaks
Clear away a flag after HTML indent load
Remove some Vim syntax boilerplate
Pare down after/indent scripts a fair bit
Remove some overzealous b:undo_* setting
Add missing detail to a comment
Remove double-key mapping shortcuts
Remove boilerplate after/ftplugin load guards
Simplify after/ftplugin for C
Set b:did_ftplugin flag in Vim ftplugins
Adjust a vimrc comment for clarity
Simplify ft=sh subtype flag clearing
Add dummy function for HTML omnicompletion
Clear away stock ft=mail quoting maps
Wrap autocmd! clear for ft=mail in :execute
Add timestamp augroup clearing to Vim ft=html
Abbreviate Vim ft=html autocmd clearing
Restore value of 'colorcolumn' after ft=gitcommit
Wrap Vim gitcommit autocmd clear in :execute
Diffstat (limited to 'vim/after/ftplugin/mail.vim')
-rw-r--r-- | vim/after/ftplugin/mail.vim | 16 |
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' |