summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Kipp <ckipp@pm.me>2023-01-11 12:20:10 +0000
committerBram Moolenaar <Bram@vim.org>2023-01-11 12:20:10 +0000
commitf68cddabffcbc5b8fbfe9003182cb4b55ff8d72c (patch)
treef75fc5c6a13cfde2b810f807f9e1d1ba01bbaae6
parentea125393af01ecaf75cee8e085a57f8143f3ae3e (diff)
patch 9.0.1176: smithy files are not recognizedv9.0.1176
Problem: smithy files are not recognized. Solution: Add a pattern for Smithy files. (Chris Kipp, closes #11804)
-rw-r--r--runtime/filetype.vim12
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 10 insertions, 5 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index e496b5beb2..ed2f63e820 100644
--- 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 dc402dc6e1..05ce070a6c 100644
--- 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 1876606340..6a5f62da9e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1176,
+/**/
1175,
/**/
1174,