diff options
| author | Christian Brabandt <cb@256bit.org> | 2023-12-01 18:01:17 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-12-01 18:01:17 +0100 |
| commit | 4f3480c94358e3b938594fc3574477e780525cd7 (patch) | |
| tree | f85b2afaac64977e2b2af55bc22b5af59c924ca2 | |
| parent | 926c3f45a20c9c9667466f69d8c33ef8acb354ec (diff) | |
patch 9.0.2139: html.angular ft is problematicv9.0.2139
Problem: html.angular ft is problematic
Solution: partly revert v9.0.2137
The html.angular filetype causes issues and does not trigger FileType
autocommands for the html or angular filetypes.
So let's roll back that particular change and detect this only as html
file
related: https://github.com/vim/vim/pull/13594#issuecomment-1834465890
closes: #13604
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | runtime/filetype.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 0317ccc930..965ebacdec 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -95,9 +95,6 @@ au BufNewFile,BufRead *.aidl setf aidl " AMPL au BufNewFile,BufRead *.run setf ampl -" Angular in HTML -au BufNewFile,BufRead *.component.html setf html.angular - " Ant au BufNewFile,BufRead build.xml setf ant diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 0de4c807a0..08662e6c11 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -318,8 +318,7 @@ def s:GetFilenameChecks(): dict<list<string>> hoon: ['file.hoon'], hostconf: ['/etc/host.conf', 'any/etc/host.conf'], hostsaccess: ['/etc/hosts.allow', '/etc/hosts.deny', 'any/etc/hosts.allow', 'any/etc/hosts.deny'], - html: ['file.html', 'file.htm', 'file.cshtml'], - 'html.angular': ['file.component.html'], + html: ['file.html', 'file.htm', 'file.cshtml', 'file.component.html'], htmlm4: ['file.html.m4'], httest: ['file.htt', 'file.htb'], hurl: ['file.hurl'], diff --git a/src/version.c b/src/version.c index 81128a3de0..3fc23c17e5 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2139, +/**/ 2138, /**/ 2137, |