To: vim_dev@googlegroups.com
Subject: Patch 8.2.2954
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.2954
Problem:    Short file name extension for Scala not recognized.
Solution:   Recognize *.sc. (closes #8337)
Files:      runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-8.2.2953/runtime/filetype.vim	2021-05-23 11:18:44.826239726 +0200
--- runtime/filetype.vim	2021-06-06 20:13:23.849097057 +0200
***************
*** 1496,1502 ****
  au BufNewFile,BufRead *.sa			setf sather
  
  " Scala
! au BufNewFile,BufRead *.scala			setf scala
  
  " SBT - Scala Build Tool
  au BufNewFile,BufRead *.sbt			setf sbt
--- 1496,1502 ----
  au BufNewFile,BufRead *.sa			setf sather
  
  " Scala
! au BufNewFile,BufRead *.scala,*.sc		setf scala
  
  " SBT - Scala Build Tool
  au BufNewFile,BufRead *.sbt			setf sbt
*** ../vim-8.2.2953/src/testdir/test_filetype.vim	2021-05-23 11:18:44.826239726 +0200
--- src/testdir/test_filetype.vim	2021-06-06 20:13:40.333058467 +0200
***************
*** 423,429 ****
      \ 'sass': ['file.sass'],
      \ 'sather': ['file.sa'],
      \ 'sbt': ['file.sbt'],
!     \ 'scala': ['file.scala'],
      \ 'scheme': ['file.scm', 'file.ss', 'file.rkt'],
      \ 'scilab': ['file.sci', 'file.sce'],
      \ 'screen': ['.screenrc', 'screenrc'],
--- 423,429 ----
      \ 'sass': ['file.sass'],
      \ 'sather': ['file.sa'],
      \ 'sbt': ['file.sbt'],
!     \ 'scala': ['file.scala', 'file.sc'],
      \ 'scheme': ['file.scm', 'file.ss', 'file.rkt'],
      \ 'scilab': ['file.sci', 'file.sce'],
      \ 'screen': ['.screenrc', 'screenrc'],
*** ../vim-8.2.2953/src/version.c	2021-06-06 17:34:10.324945725 +0200
--- src/version.c	2021-06-06 20:15:17.008832330 +0200
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     2954,
  /**/

-- 
A fool must search for a greater fool to find admiration.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///