patch 8.2.2954: short file name extension for Scala not recognized

Problem:    Short file name extension for Scala not recognized.
Solution:   Recognize *.sc. (closes #8337)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index b1eb2ecbea9f5220d673f14710c20be443fea664..8ca6f6a77b927bee52ac9635fcaae8cb81aba869 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1496,7 +1496,7 @@ au BufNewFile,BufRead *.sass                      setf sass
 au BufNewFile,BufRead *.sa                     setf sather
 
 " Scala
-au BufNewFile,BufRead *.scala                  setf scala
+au BufNewFile,BufRead *.scala,*.sc             setf scala
 
 " SBT - Scala Build Tool
 au BufNewFile,BufRead *.sbt                    setf sbt

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 1b07b0e616cdcd05bceb9c43ac16f52c66a59c84..ac227fee172d5d8e8a5645da134ee7042ff4a39a 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -423,7 +423,7 @@ let s:filename_checks = {
     \ 'sass': ['file.sass'],
     \ 'sather': ['file.sa'],
     \ 'sbt': ['file.sbt'],
-    \ 'scala': ['file.scala'],
+    \ 'scala': ['file.scala', 'file.sc'],
     \ 'scheme': ['file.scm', 'file.ss', 'file.rkt'],
     \ 'scilab': ['file.sci', 'file.sce'],
     \ 'screen': ['.screenrc', 'screenrc'],

diff --git a/src/version.c b/src/version.c
index 1e9a787e9b0a7d5d403d115c3fc824803b9b2dbb..f9529abc1d2fa520325f04b5a380e5a1ff91ba5a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2954,
 /**/
     2953,
 /**/