From: Brennon M <d1pl0mat@outlook.com>
Date: Sun, 6 Jun 2021 18:15:53 +0000 (+0200)
Subject: patch 8.2.2954: short file name extension for Scala not recognized
X-Git-Tag: v8.2.2954
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6db7b6375a3ea3afef5295b1366896902012e640;p=vim

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 b1eb2ecbe..8ca6f6a77 100644
--- 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 1b07b0e61..ac227fee1 100644
--- 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 1e9a787e9..f9529abc1 100644
--- 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,
 /**/