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>

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
 

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: ['file.html', 'file.htm', 'file.cshtml', 'file.component.html'],
-    'html.angular': ['file.component.html'],
     htmlm4: ['file.html.m4'],
     httest: ['file.htt', 'file.htb'],
     hurl: ['file.hurl'],

src/version.c

@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2139,
 /**/
     2138,
 /**/