diff options
| author | Aaron Tinio <aptinio@gmail.com> | 2022-04-10 12:13:56 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-04-10 12:13:56 +0100 |
| commit | fa76a24109f3c3287e4ee17b6270bfd5310c12f3 (patch) | |
| tree | a8076eaa759323f067a215ce5cd6d634ef8f9db6 /src | |
| parent | 021996ffaa933d9dc0c3553ca01de93fbf3d522b (diff) | |
| download | vim-git-fa76a24109f3c3287e4ee17b6270bfd5310c12f3.tar.gz | |
patch 8.2.4729: HEEx and Surface templates do not need a separate filetypev8.2.4729
Problem: HEEx and Surface templates do not need a separate filetype.
Solution: Use Eelixir for the similar filetypes. (Aaron Tinio, closes #10124)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_filetype.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 7a91cef8c..b1b912e01 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -166,7 +166,7 @@ let s:filename_checks = { \ 'edif': ['file.edf', 'file.edif', 'file.edo'], \ 'elinks': ['elinks.conf'], \ 'elixir': ['file.ex', 'file.exs', 'mix.lock'], - \ 'eelixir': ['file.eex', 'file.leex'], + \ 'eelixir': ['file.eex', 'file.heex', 'file.leex', 'file.sface'], \ 'elm': ['file.elm'], \ 'elmfilt': ['filter-rules'], \ 'elvish': ['file.elv'], @@ -237,7 +237,6 @@ let s:filename_checks = { \ 'hb': ['file.hb'], \ 'hcl': ['file.hcl'], \ 'hercules': ['file.vc', 'file.ev', 'file.sum', 'file.errsum'], - \ 'heex': ['file.heex'], \ 'hex': ['file.hex', 'file.h32'], \ 'hgcommit': ['hg-editor-file.txt'], \ 'hjson': ['file.hjson'], @@ -517,7 +516,6 @@ let s:filename_checks = { \ 'stata': ['file.ado', 'file.do', 'file.imata', 'file.mata'], \ 'stp': ['file.stp'], \ 'sudoers': ['any/etc/sudoers', 'sudoers.tmp', '/etc/sudoers', 'any/etc/sudoers.d/file'], - \ 'surface': ['file.sface'], \ 'svg': ['file.svg'], \ 'svn': ['svn-commitfile.tmp', 'svn-commit-file.tmp', 'svn-commit.tmp'], \ 'swift': ['file.swift'], diff --git a/src/version.c b/src/version.c index 9657184d2..5bffc8582 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4729, +/**/ 4728, /**/ 4727, |