patch 9.0.2139: html.angular ft is problematic

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>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 0317ccc9309e3a87fea40ef7b06f8319e0cb0b78..965ebacdec382f58c4104ece32a1e6604356adc8 100644 (file)
--- 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 0de4c807a00506d2519034c7b5c1e37e0d7b4403..08662e6c11580bca67b4489c7a0b67ab83a7e76d 100644 (file)
--- 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 81128a3de021e645ed5864a8ea4faa7a3a3c7229..3fc23c17e501371ac813a503d0e15a7f152c60de 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2139,
 /**/
     2138,
 /**/