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, 3 insertions, 13 deletions

diff --git a/vim/after/ftplugin/sh.vim b/vim/after/ftplugin/sh.vim
index fdc42ccc..6ee016a5 100644
--- a/vim/after/ftplugin/sh.vim
+++ b/vim/after/ftplugin/sh.vim
@@ -1,8 +1,3 @@
-" Extra configuration for shell script
-if &filetype !=# 'sh' || v:version < 700 || &compatible
-  finish
-endif
-
 " Set comment formats
 setlocal comments=:#
 setlocal formatoptions+=or
@@ -34,14 +29,9 @@ if exists('b:is_posix')
 endif
 
 " Queue up undo commands to clear the shell language flags that we set for
-" this buffer during filetype detection in filetype.vim
-if exists('b:is_bash')
-  let b:undo_ftplugin .= '|unlet b:is_bash'
-elseif exists('b:is_kornshell')
-  let b:undo_ftplugin .= '|unlet b:is_kornshell'
-elseif exists('b:is_posix')
-  let b:undo_ftplugin .= '|unlet b:is_posix'
-endif
+" this buffer during filetype detection in filetype.vim, or that the stock
+" syntax highlighting chose for us
+let b:undo_ftplugin .= '|unlet! b:is_bash b:is_kornshell b:is_posix'
 
 " Stop here if the user doesn't want ftplugin mappings
 if exists('g:no_plugin_maps') || exists('g:no_sh_maps')