summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-06-15 20:24:58 +0200
committerBram Moolenaar <Bram@vim.org>2020-06-15 20:24:58 +0200
commitad72350360d1a68d251da62a6e8610950926278c (patch)
tree9113907cc82c3c404200b2b1f36cd1f031fb762f
parentb340baed9f7fc1c19a0742e2214d54982190c15e (diff)
downloadvim-git-ad72350360d1a68d251da62a6e8610950926278c.tar.gz
patch 8.2.0983: SConstruct file type not recognizedv8.2.0983
Problem: SConstruct file type not recognized. Solution: Use python for SConstruct files. (Roland Hieber)
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index cc3c01fbd..b94951c54 100644
--- 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 331260d34..9d5bc6782 100644
--- 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 0866fcc83..7d7b965f0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 983,
+/**/
982,
/**/
981,