patch 9.0.1549: USD filetype is not recognized

Problem:    USD filetype is not recognized.
Solution:   Add patterns for USD filetype. (Colin Kennedy, closes #12370)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 7618902fd59b59a5a97c17282f9a661fc3dd342b..fe1a8885793029ae9fb0b4310399ef33d69cf2ac 100644 (file)
--- 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 3e90381b3799fd331d6ace6cd2616e53eb28d898..ceaee8ab1d2d3d067f325c3794b2c915e6c07fbf 100644 (file)
--- 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 a3c9453d19d959be59f75932baff9b9ab670f44a..857a22960eeaf6e16a7e7c09c8e9a03b01c7e2e2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1549,
 /**/
     1548,
 /**/