patch 9.0.0084: using "terraform" filetype for .tfvars file is bad

Problem:    Using "terraform" filetype for .tfvars file is bad.
Solution:   use "terraform-vars", so that different completion and other
            mechanisms can be used. (Radek Simko, closes #10755)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ce3838d10ecab8db4a188b2c9daaf0c3040dfad4..ae52604392b4331b288d9232b7e12fa7b183c030 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1982,8 +1982,8 @@ au BufRead,BufNewFile *.ttl
 " Terminfo
 au BufNewFile,BufRead *.ti                     setf terminfo
 
-" Terraform
-au BufRead,BufNewFile *.tfvars                 setf terraform
+" Terraform variables
+au BufRead,BufNewFile *.tfvars                 setf terraform-vars
 
 " TeX
 au BufNewFile,BufRead *.latex,*.sty,*.dtx,*.ltx,*.bbl  setf tex

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index b5044297a8a1e54f61b13448286e5e4e4c14950d..ea7bf3eca2f6ee38dbca5f3533e30063ec5f3883 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -549,7 +549,7 @@ let s:filename_checks = {
     \ 'template': ['file.tmpl'],
     \ 'teraterm': ['file.ttl'],
     \ 'terminfo': ['file.ti'],
-    \ 'terraform': ['file.tfvars'],
+    \ 'terraform-vars': ['file.tfvars'],
     \ 'tex': ['file.latex', 'file.sty', 'file.dtx', 'file.ltx', 'file.bbl'],
     \ 'texinfo': ['file.texinfo', 'file.texi', 'file.txi'],
     \ 'texmf': ['texmf.cnf'],

diff --git a/src/version.c b/src/version.c
index 7f4b42dc484c0256062140533ad5b34c1304dd76..03b65d2472e320dd12f17d9d0df6cfc8ee0dd672 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    84,
 /**/
     83,
 /**/