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

1 files changed, 0 insertions, 22 deletions

diff --git a/vim/after/ftplugin/vim.vim b/vim/after/ftplugin/vim.vim
index 2fc5bd78..a7a69993 100644
--- a/vim/after/ftplugin/vim.vim
+++ b/vim/after/ftplugin/vim.vim
@@ -1,8 +1,3 @@
-" Extra configuration for Vim scripts
-if &filetype !=# 'vim' || v:version < 700 || &compatible
-  finish
-endif
-
 " Use Vint as a syntax checker
 if bufname('%') !=# 'command-line'
   compiler vint
@@ -19,20 +14,3 @@ endif
 nnoremap <buffer> <LocalLeader>K
       \ :<C-U>helpgrep <cword><CR>
 let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>K'
-
-" Get rid of the core ftplugin's square-bracket maps on unload
-" 8.1.273 updated the runtime files to include a fix for this
-if v:version < 801 || v:version == 801 && !has('patch273')
-  let b:undo_ftplugin .= '|nunmap <buffer> [['
-        \ . '|vunmap <buffer> [['
-        \ . '|nunmap <buffer> ]]'
-        \ . '|vunmap <buffer> ]]'
-        \ . '|nunmap <buffer> []'
-        \ . '|vunmap <buffer> []'
-        \ . '|nunmap <buffer> ]['
-        \ . '|vunmap <buffer> ]['
-        \ . '|nunmap <buffer> ]"'
-        \ . '|vunmap <buffer> ]"'
-        \ . '|nunmap <buffer> ["'
-        \ . '|vunmap <buffer> ["'
-endif