patch 8.1.1177: .ts files are recognized as xml, typescript is more common

Problem:    .ts files are recognized as xml, while typescript is more common.
Solution:   Recognize .ts files as typescript. (closes #4264)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 89370f79cef26270a95e50ab6aed9fcc12b2edf3..6d68c7152a323d76ed3a8bef69013b182d501da5 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1699,6 +1699,9 @@ au BufNewFile,BufReadPost *.tsscl         setf tsscl
 " TWIG files
 au BufNewFile,BufReadPost *.twig               setf twig
 
+" Typescript
+au BufNewFile,BufReadPost *.ts                 setf typescript
+
 " Motif UIT/UIL files
 au BufNewFile,BufRead *.uit,*.uil              setf uil
 

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index fd2f38355f32e497a6ce3d84c07cda88bb8ec383..fe6a0a1514c0556fc5ef50c7667244108028159a 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -451,6 +451,7 @@ let s:filename_checks = {
     \ 'tssgm': ['file.tssgm'],
     \ 'tssop': ['file.tssop'],
     \ 'twig': ['file.twig'],
+    \ 'typescript': ['file.ts'],
     \ 'uc': ['file.uc'],
     \ 'udevconf': ['/etc/udev/udev.conf'],
     \ 'udevperm': ['/etc/udev/permissions.d/file.permissions'],
@@ -485,7 +486,7 @@ let s:filename_checks = {
     \ 'xhtml': ['file.xhtml', 'file.xht'],
     \ 'xinetd': ['/etc/xinetd.conf'],
     \ 'xmath': ['file.msc', 'file.msf'],
-    \ 'xml': ['/etc/blkid.tab', '/etc/blkid.tab.old', 'file.xmi', 'file.csproj', 'file.csproj.user', 'file.ts', 'file.ui', 'file.tpm', '/etc/xdg/menus/file.menu', 'fglrxrc', 'file.xlf', 'file.xliff', 'file.xul', 'file.wsdl'],
+    \ 'xml': ['/etc/blkid.tab', '/etc/blkid.tab.old', 'file.xmi', 'file.csproj', 'file.csproj.user', 'file.ui', 'file.tpm', '/etc/xdg/menus/file.menu', 'fglrxrc', 'file.xlf', 'file.xliff', 'file.xul', 'file.wsdl'],
     \ 'xmodmap': ['anyXmodmap'],
     \ 'xf86conf': ['xorg.conf', 'xorg.conf-4'],
     \ 'xpm2': ['file.xpm2'],

diff --git a/src/version.c b/src/version.c
index bfb5c59c6a652690a03170b45d42af2b6a230466..939f378be9670ac6642cba89c95e420011b2c728 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1177,
 /**/
     1176,
 /**/