patch 8.1.0484: some file types are not recognized

Problem:    Some file types are not recognized.
Solution:   Update the file type detection.

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 98b5c71f2c9f873aafad939857d433c8e95edd97..218b01fb6503527f949ef5315efd78dce0d17a4d 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1263,9 +1263,9 @@ au BufNewFile,BufRead */etc/protocols             setf protocols
 " Pyrex
 au BufNewFile,BufRead *.pyx,*.pxd              setf pyrex
 
-" Python, Python Shell Startup Files
+" Python, Python Shell Startup and Python Stub Files
 " Quixote (Python-based web framework)
-au BufNewFile,BufRead *.py,*.pyw,.pythonstartup,.pythonrc,*.ptl  setf python
+au BufNewFile,BufRead *.py,*.pyw,.pythonstartup,.pythonrc,*.ptl,*.pyi  setf python
 
 " Radiance
 au BufNewFile,BufRead *.rad,*.mat              setf radiance
@@ -1414,8 +1414,8 @@ au BufNewFile,BufRead *.sdl,*.pr          setf sdl
 " sed
 au BufNewFile,BufRead *.sed                    setf sed
 
-" Sieve (RFC 3028)
-au BufNewFile,BufRead *.siv                    setf sieve
+" Sieve (RFC 3028, 5228)
+au BufNewFile,BufRead *.siv,*.sieve            setf sieve
 
 " Sendmail
 au BufNewFile,BufRead sendmail.cf              setf sm

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 62dbc7473f35eb9ecf8038947be14f51c691d40a..3240f1f1d4544024e81478303aea5243c4196ca5 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -162,7 +162,7 @@ let s:filename_checks = {
     \ 'fetchmail': ['.fetchmailrc'],
     \ 'fgl': ['file.4gl', 'file.4gh', 'file.m4gl'],
     \ 'focexec': ['file.fex', 'file.focexec'],
-    \ 'forth': ['file.fs', 'file.ft'],
+    \ 'forth': ['file.fs', 'file.ft', 'file.fth'],
     \ 'fortran': ['file.f', 'file.for', 'file.fortran', 'file.fpp', 'file.ftn', 'file.f77', 'file.f90', 'file.f95', 'file.f03', 'file.f08'],
     \ 'framescript': ['file.fsl'],
     \ 'freebasic': ['file.fb', 'file.bi'],
@@ -350,7 +350,7 @@ let s:filename_checks = {
     \ 'protocols': ['/etc/protocols'],
     \ 'psf': ['file.psf'],
     \ 'pyrex': ['file.pyx', 'file.pxd'],
-    \ 'python': ['file.py', 'file.pyw', '.pythonstartup', '.pythonrc', 'file.ptl'],
+    \ 'python': ['file.py', 'file.pyw', '.pythonstartup', '.pythonrc', 'file.ptl', 'file.pyi'],
     \ 'quake': ['anybaseq2/file.cfg', 'anyid1/file.cfg', 'quake3/file.cfg'],
     \ 'radiance': ['file.rad', 'file.mat'],
     \ 'ratpoison': ['.ratpoisonrc', 'ratpoisonrc'],
@@ -389,7 +389,7 @@ let s:filename_checks = {
     \ 'services': ['/etc/services'],
     \ 'setserial': ['/etc/serial.conf'],
     \ 'sh': ['/etc/udev/cdsymlinks.conf'],
-    \ 'sieve': ['file.siv'],
+    \ 'sieve': ['file.siv', 'file.sieve'],
     \ 'simula': ['file.sim'],
     \ 'sinda': ['file.sin', 'file.s85'],
     \ 'sisu': ['file.sst', 'file.ssm', 'file.ssi', 'file.-sst', 'file._sst', 'file.sst.meta', 'file.-sst.meta', 'file._sst.meta'],
@@ -474,6 +474,7 @@ let s:filename_checks = {
     \ 'voscm': ['file.cm'],
     \ 'vrml': ['file.wrl'],
     \ 'vroom': ['file.vroom'],
+    \ 'wast': ['file.wast', 'file.wat'],
     \ 'webmacro': ['file.wm'],
     \ 'wget': ['.wgetrc', 'wgetrc'],
     \ 'winbatch': ['file.wbt'],
@@ -484,7 +485,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'],
+    \ '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'],
     \ 'xmodmap': ['anyXmodmap'],
     \ 'xf86conf': ['xorg.conf', 'xorg.conf-4'],
     \ 'xpm2': ['file.xpm2'],

diff --git a/src/version.c b/src/version.c
index 2c7550dc138f93840e1092589f9d4bb3b42202ef..ab54bb3120323070cd70fad75c1f5862d5da1989 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    484,
 /**/
     483,
 /**/