diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-07-26 19:18:28 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-07-26 19:18:28 +0100 |
| commit | 15b87b6610bfce0c6296bbbad019c944f88a74ca (patch) | |
| tree | 92873510f09663b1659444ed53a11f0169c9bc43 | |
| parent | c9e8fd6fc7d2027d0645b376d95a6ed51098036c (diff) | |
| download | vim-git-15b87b6610bfce0c6296bbbad019c944f88a74ca.tar.gz | |
patch 9.0.0084: using "terraform" filetype for .tfvars file is badv9.0.0084
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)
| -rw-r--r-- | runtime/filetype.vim | 4 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | 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 @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 84, +/**/ 83, /**/ 82, |