patch 9.0.1176: smithy files are not recognized

Problem:    smithy files are not recognized.
Solution:   Add a pattern for Smithy files. (Chris Kipp, closes #11804)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index e496b5beb2c54957cce079ab92d766050512b899..ed2f63e820b554494d63eb8b0ff07a5590482fbb 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -110,9 +110,11 @@ au BufNewFile,BufRead *.a65                        setf a65
 " Applescript
 au BufNewFile,BufRead *.scpt                   setf applescript
 
+" Automake (must be before the *.am pattern)
+au BufNewFile,BufRead [mM]akefile.am,GNUmakefile.am    setf automake
+
 " Applix ELF
-au BufNewFile,BufRead *.am
-       \ if expand("<afile>") !~? 'Makefile.am\>' | setf elf | endif
+au BufNewFile,BufRead *.am                     setf elf
 
 " ALSA configuration
 au BufNewFile,BufRead .asoundrc,*/usr/share/alsa/alsa.conf,*/etc/asound.conf setf alsaconf
@@ -187,9 +189,6 @@ au BufNewFile,BufRead *.au3                 setf autoit
 " Autohotkey
 au BufNewFile,BufRead *.ahk                    setf autohotkey
 
-" Automake
-au BufNewFile,BufRead [mM]akefile.am,GNUmakefile.am    setf automake
-
 " Autotest .at files are actually m4
 au BufNewFile,BufRead *.at                     setf m4
 
@@ -1928,6 +1927,9 @@ au BufNewFile,BufRead *.smi
 " SMITH
 au BufNewFile,BufRead *.smt,*.smith            setf smith
 
+" Smithy
+au BufNewFile,BufRead *.smithy                 setf smithy
+
 " Snobol4 and spitbol
 au BufNewFile,BufRead *.sno,*.spt              setf snobol4
 

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index dc402dc6e163078b290fba639e89983ff2a290b5..05ce070a6c3dd5fa4a223ccc9add651ec161fa02 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -528,6 +528,7 @@ let s:filename_checks = {
     \ 'smarty': ['file.tpl'],
     \ 'smcl': ['file.hlp', 'file.ihlp', 'file.smcl'],
     \ 'smith': ['file.smt', 'file.smith'],
+    \ 'smithy': ['file.smithy'],
     \ 'sml': ['file.sml'],
     \ 'snobol4': ['file.sno', 'file.spt'],
     \ 'solidity': ['file.sol'],

diff --git a/src/version.c b/src/version.c
index 18766063406afbd87144f400cb27296d798a61f4..6a5f62da9e2cd184495aa23e1899a3224728b78c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1176,
 /**/
     1175,
 /**/