# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1701450903 -3600
# Node ID f566fe683cad652e584156fede7eff1f28dd0dc1
# Parent  af382e6903ac1582a7320bb6f103b48eecb84ff7
patch 9.0.2139: html.angular ft is problematic

Commit: https://github.com/vim/vim/commit/4f3480c94358e3b938594fc3574477e780525cd7
Author: Christian Brabandt <cb@256bit.org>
Date:   Fri Dec 1 18:01:17 2023 +0100

    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
--- 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
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -318,8 +318,7 @@ def s:GetFilenameChecks(): dict<list<str
     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
--- 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,