summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Kennedy <colinvfx@gmail.com>2023-05-13 12:15:57 +0100
committerBram Moolenaar <Bram@vim.org>2023-05-13 12:15:57 +0100
commitb848ce6b7e27f24aff47a4d63933e0f96663acfe (patch)
tree6aa4e07be4860997b81f350010f25279ff7cf9e6
parentff40b625a693cf5094abe76b77655f13ad48739b (diff)
patch 9.0.1549: USD filetype is not recognizedv9.0.1549
Problem: USD filetype is not recognized. Solution: Add patterns for USD filetype. (Colin Kennedy, closes #12370)
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 7618902fd5..fe1a888579 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2746,6 +2746,9 @@ au BufNewFile,BufRead .login*,.cshrc* call dist#ft#CSH()
" tmux configuration with arbitrary extension
au BufNewFile,BufRead {.,}tmux*.conf* setf tmux
+" Universal Scene Description
+au BufNewFile,BufRead *.usda,*.usd setf usd
+
" VHDL
au BufNewFile,BufRead *.vhdl_[0-9]* call s:StarSetf('vhdl')
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 3e90381b37..ceaee8ab1d 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -638,6 +638,7 @@ let s:filename_checks = {
\ 'upstreamdat': ['upstream.dat', 'UPSTREAM.DAT', 'upstream.file.dat', 'UPSTREAM.FILE.DAT', 'file.upstream.dat', 'FILE.UPSTREAM.DAT'],
\ 'upstreaminstalllog': ['upstreaminstall.log', 'UPSTREAMINSTALL.LOG', 'upstreaminstall.file.log', 'UPSTREAMINSTALL.FILE.LOG', 'file.upstreaminstall.log', 'FILE.UPSTREAMINSTALL.LOG'],
\ 'upstreamlog': ['fdrupstream.log', 'upstream.log', 'UPSTREAM.LOG', 'upstream.file.log', 'UPSTREAM.FILE.LOG', 'file.upstream.log', 'FILE.UPSTREAM.LOG', 'UPSTREAM-file.log', 'UPSTREAM-FILE.LOG'],
+ \ 'usd': ['file.usda', 'file.usd'],
\ 'usserverlog': ['usserver.log', 'USSERVER.LOG', 'usserver.file.log', 'USSERVER.FILE.LOG', 'file.usserver.log', 'FILE.USSERVER.LOG'],
\ 'usw2kagtlog': ['usw2kagt.log', 'USW2KAGT.LOG', 'usw2kagt.file.log', 'USW2KAGT.FILE.LOG', 'file.usw2kagt.log', 'FILE.USW2KAGT.LOG'],
\ 'vala': ['file.vala'],
diff --git a/src/version.c b/src/version.c
index a3c9453d19..857a22960e 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 */
/**/
+ 1549,
+/**/
1548,
/**/
1547,