diff options
| author | Christian Brabandt <cb@256bit.org> | 2023-08-07 17:00:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-07 17:00:41 +0200 |
| commit | 9fcde94176b9c1a3b85d054cc388c49cb17dfb18 (patch) | |
| tree | 56c6193f8388da603df89fc42113e243b1266122 | |
| parent | 4c0089d696b8d1d5dc40568f25ea5738fa5bbffb (diff) | |
| parent | ad34abee258322826146d597ac5b5fd2111c2b79 (diff) | |
Merge pull request #12740 from k-takata/import-9.0.1678v9.0.1678
Bring Bram's last patch (9.0.1678) to GitHub
| -rw-r--r-- | runtime/filetype.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index cdeb556410..d0ee535f58 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -254,6 +254,9 @@ au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key setf named au BufNewFile,BufRead named.root setf bindzone au BufNewFile,BufRead *.db call dist#ft#BindzoneCheck('') +" Blade +au BufNewFile,BufRead *.blade.php setf blade + " Blank au BufNewFile,BufRead *.bl setf blank diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index e2f2f045bb..778e840d0e 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -122,6 +122,7 @@ def s:GetFilenameChecks(): dict<list<string>> bicep: ['file.bicep'], bindzone: ['named.root', '/bind/db.file', '/named/db.file', 'any/bind/db.file', 'any/named/db.file'], bitbake: ['file.bb', 'file.bbappend', 'file.bbclass', 'build/conf/local.conf', 'meta/conf/layer.conf', 'build/conf/bbappend.conf', 'meta-layer/conf/distro/foo.conf'], + blade: ['file.blade.php'], blank: ['file.bl'], blueprint: ['file.blp'], bsdl: ['file.bsd', 'file.bsdl'], diff --git a/src/version.c b/src/version.c index 8e470ef7a8..e5b4844855 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1678, +/**/ 1677, /**/ 1676, |