• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revisionf566fe683cad652e584156fede7eff1f28dd0dc1 (tree)
Time2023-12-02 02:15:03
AuthorChristian Brabandt <cb@256b...>
CommiterChristian Brabandt

Log Message

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
closes: #13604
Signed-off-by: Christian Brabandt <cb@256bit.org>

Change Summary

Incremental Difference

diff -r af382e6903ac -r f566fe683cad runtime/filetype.vim
--- a/runtime/filetype.vim Fri Dec 01 18:00:05 2023 +0100
+++ b/runtime/filetype.vim Fri Dec 01 18:15:03 2023 +0100
@@ -95,9 +95,6 @@
9595 " AMPL
9696 au BufNewFile,BufRead *.run setf ampl
9797
98-" Angular in HTML
99-au BufNewFile,BufRead *.component.html setf html.angular
100-
10198 " Ant
10299 au BufNewFile,BufRead build.xml setf ant
103100
diff -r af382e6903ac -r f566fe683cad src/testdir/test_filetype.vim
--- a/src/testdir/test_filetype.vim Fri Dec 01 18:00:05 2023 +0100
+++ b/src/testdir/test_filetype.vim Fri Dec 01 18:15:03 2023 +0100
@@ -318,8 +318,7 @@
318318 hoon: ['file.hoon'],
319319 hostconf: ['/etc/host.conf', 'any/etc/host.conf'],
320320 hostsaccess: ['/etc/hosts.allow', '/etc/hosts.deny', 'any/etc/hosts.allow', 'any/etc/hosts.deny'],
321- html: ['file.html', 'file.htm', 'file.cshtml'],
322- 'html.angular': ['file.component.html'],
321+ html: ['file.html', 'file.htm', 'file.cshtml', 'file.component.html'],
323322 htmlm4: ['file.html.m4'],
324323 httest: ['file.htt', 'file.htb'],
325324 hurl: ['file.hurl'],
diff -r af382e6903ac -r f566fe683cad src/version.c
--- a/src/version.c Fri Dec 01 18:00:05 2023 +0100
+++ b/src/version.c Fri Dec 01 18:15:03 2023 +0100
@@ -705,6 +705,8 @@
705705 static int included_patches[] =
706706 { /* Add new patch number below this line */
707707 /**/
708+ 2139,
709+/**/
708710 2138,
709711 /**/
710712 2137,
Show on old repository browser