Merge c99604b4ae into bc8a81d359

README.md

@@ -1,5 +1,11 @@
+This is my top-starred repository on Github, so I've decided to put this ad here:
+
+If you work for big corp and seek consulting, please visit following repository: https://github.com/sheerun/consultation
+
 ![vim-polyglot](https://i.imgur.com/9RxQK6k.png)
 
+[![build](https://github.com/sheerun/vim-polyglot/workflows/Vim%20Polyglot%20CI/badge.svg)](https://github.com/sheerun/vim-polyglot/actions) [![Maintenance](https://img.shields.io/badge/maintained%20since-2013-yes)]()
+
 A collection of language packs for Vim.
 
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.

ftplugin/terraform.vim

@@ -9,6 +9,16 @@ if exists('b:did_ftplugin') || v:version < 700 || &compatible
   finish
 endif
 
+if !has('patch-7.4.1142')
+  " Include hyphens as keyword characters so that:
+  " 1. a keyword appearing as part of a longer name doesn't get partially
+  "    highlighted.
+  " 2. Goto local declaration works correctly (see `:h gd`)
+  " 3. Tag navigation works correctly (see `:h i_CTRL-X_CTRL-]`)
+  setlocal iskeyword+=-
+  let b:undo_ftplugin .= ' iskeyword<'
+endif
+
 " Have only kept the terraform versions of these options for backwards
 " compatibility.
 if get(g:, 'terraform_fold_sections', 0)