6 files changed, 36 insertions, 11 deletions
diff --git a/after/ftplugin/terraform.vim b/after/ftplugin/terraform.vim
index f495e583..17115b1b 100644
--- a/after/ftplugin/terraform.vim
+++ b/after/ftplugin/terraform.vim
@@ -18,4 +18,11 @@ if g:terraform_align && exists(':Tabularize')
   endfunction
 endif
 
+" Match the identation put in place by Hashicorp and :TerraformFmt, https://github.com/hashivim/vim-terraform/issues/21
+if get(g:, "terraform_align", 1)
+  setlocal tabstop=2
+  setlocal softtabstop=2
+  setlocal shiftwidth=2
+endif
+
 endif
diff --git a/after/ftplugin/vue.vim b/after/ftplugin/vue.vim
deleted file mode 100644
index fd786923..00000000
--- a/after/ftplugin/vue.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
-  
-setlocal suffixesadd+=.vue
-
-endif
diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index aa4a31ec..8cec90f6 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -25,6 +25,16 @@ syn match    cCustomFunc     "\w\+\s*(\@=" contains=cCustomParen
 hi def link cCustomFunc  Function
 
 " -----------------------------------------------------------------------------
+"  Highlight member variable names.
+" -----------------------------------------------------------------------------
+if exists('g:cpp_member_variable_highlight') && g:cpp_member_variable_highlight
+    syn match   cCustomDot    "\." contained
+    syn match   cCustomPtr    "->" contained
+    syn match   cCustomMemVar "\(\.\|->\)\w\+" contains=cCustomDot,cCustomPtr
+    hi def link cCustomMemVar Function
+endif
+
+" -----------------------------------------------------------------------------
 "  Source: aftersyntaxc.vim
 " -----------------------------------------------------------------------------
 
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index 99d9f18e..4faa0f6b 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -557,6 +557,7 @@ syntax keyword cppSTLios defaultfloat
 syntax keyword cppSTLios endl
 syntax keyword cppSTLios ends
 syntax keyword cppSTLios fixed
+syntax keyword cppSTLios floatfield
 syntax keyword cppSTLios flush
 syntax keyword cppSTLios get_money
 syntax keyword cppSTLios get_time
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index ab99117d..43c0c41e 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -35,6 +35,22 @@ syn region ShaderScript
       \ contains=@GLSL,htmlScriptTag,@htmlPreproc
 
 endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+  
+" Vim syntax file
+" Language:     HTML (version 5.1)
+" Last Change:  2017 Feb 15
+" License:      Public domain
+"               (but let me know if you like :) )
+"
+" Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
+
+" Comment
+" https://github.com/w3c/html/issues/694
+syntax region htmlComment start=+<!--+ end=+-->+ contains=@Spell
+syntax region htmlComment start=+<!DOCTYPE+ keepend end=+>+
+
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
   
 if !exists("g:less_html_style_tags")
diff --git a/after/syntax/yaml.vim b/after/syntax/yaml.vim
index 7f4808db..78983cc2 100644
--- a/after/syntax/yaml.vim
+++ b/after/syntax/yaml.vim
@@ -21,9 +21,7 @@ if version < 600
 endif
 syntax clear
 
-syn match yamlDelimiter	"[:,-]"
 syn match yamlBlock "[\[\]\{\}\|\>]"
-syn match yamlOperator "[?^+-]\|=>"
 
 syn region yamlComment	start="\#" end="$"
 syn match yamlIndicator	"#YAML:\S\+"
@@ -41,10 +39,11 @@ syn keyword yamlConstant TRUE True true YES Yes yes ON On on
 syn keyword yamlConstant FALSE False false NO No no OFF Off off
 
 syn match  yamlKey	"^\s*\zs\S\+\ze\s*:"
+syn match  yamlKey	"^\s*-\s*\zs\S\+\ze\s*:"
 syn match  yamlAnchor	"&\S\+"
 syn match  yamlAlias	"*\S\+"
 
-" Setupt the hilighting links
+" Setup the highlighting links
 
 hi link yamlConstant Keyword
 hi link yamlIndicator PreCondit
@@ -55,10 +54,7 @@ hi link yamlType	Type
 
 hi link yamlComment	Comment
 hi link yamlBlock	Operator
-hi link yamlOperator	Operator
-hi link yamlDelimiter	Delimiter
 hi link yamlString	String
 hi link yamlEscape	Special
 
-
 endif