Mercurial > vim

changeset 33859:f566fe683cad v9.0.2139

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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>
author Christian Brabandt <cb@256bit.org>
date Fri, 01 Dec 2023 18:15:03 +0100
parents af382e6903ac
children 58f24d966299
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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'],
--- 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,