From 15b87b6610bfce0c6296bbbad019c944f88a74ca Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 26 Jul 2022 19:18:28 +0100 Subject: [PATCH] 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) --- runtime/filetype.vim | 4 ++-- src/testdir/test_filetype.vim | 2 +- src/version.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index ce3838d10..ae5260439 100644 --- 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 b5044297a..ea7bf3eca 100644 --- 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 7f4b42dc4..03b65d247 100644 --- 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, /**/ -- 2.40.0