patch 8.2.0983: SConstruct file type not recognized

Problem:    SConstruct file type not recognized.
Solution:   Use python for SConstruct files. (Roland Hieber)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index cc3c01fbdca7b4294f79ac55b542577d0cdfe17e..b94951c54907ae5f594de631ac69b750bf89226a 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1296,7 +1296,8 @@ au BufNewFile,BufRead *.pyx,*.pxd         setf pyrex
 
 " Python, Python Shell Startup and Python Stub Files
 " Quixote (Python-based web framework)
-au BufNewFile,BufRead *.py,*.pyw,.pythonstartup,.pythonrc,*.ptl,*.pyi  setf python
+au BufNewFile,BufRead *.py,*.pyw,.pythonstartup,.pythonrc  setf python
+au BufNewFile,BufRead *.ptl,*.pyi,SConstruct              setf python
 
 " Radiance
 au BufNewFile,BufRead *.rad,*.mat              setf radiance

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 331260d34371f46b755ffe365a9cd5575a2182f6..9d5bc6782ea8d03c2ff860ab855a9f45f473c94d 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -361,7 +361,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', 'file.pyi'],
+    \ 'python': ['file.py', 'file.pyw', '.pythonstartup', '.pythonrc', 'file.ptl', 'file.pyi', 'SConstruct'],
     \ 'quake': ['anybaseq2/file.cfg', 'anyid1/file.cfg', 'quake3/file.cfg'],
     \ 'radiance': ['file.rad', 'file.mat'],
     \ 'ratpoison': ['.ratpoisonrc', 'ratpoisonrc'],

diff --git a/src/version.c b/src/version.c
index 0866fcc830a2c3a3183da81fa65060f16632873f..7d7b965f031fff6a209225cd9bd37e05c0a92b34 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    983,
 /**/
     982,
 /**/