summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Dunford <zenmatic@gmail.com>2021-12-03 17:44:26 +0000
committerBram Moolenaar <Bram@vim.org>2021-12-03 17:44:26 +0000
commit6f42cb6e5159b323814a53bbc82def4f2cfb17ad (patch)
tree8bf11dfd4c73e055f54dc65c6a7703e8ed429ea9
parent04b7b4bf7fe57375bf3c4ed3fd087fc0bb0147ba (diff)
downloadvim-git-6f42cb6e5159b323814a53bbc82def4f2cfb17ad.tar.gz
patch 8.2.3729: no support for squirrelsv8.2.3729
Problem: No support for squirrels. (closes #9259) Solution: Recognize nuts.
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 0bc9926f3..00711d7b5 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1756,6 +1756,9 @@ au BufNewFile,BufRead *.sqlj setf sqlj
" SQR
au BufNewFile,BufRead *.sqr,*.sqi setf sqr
+" Squirrel
+au BufNewFile,BufRead *.nut setf squirrel
+
" OpenSSH configuration
au BufNewFile,BufRead ssh_config,*/.ssh/config setf sshconfig
au BufNewFile,BufRead */etc/ssh/ssh_config.d/*.conf setf sshconfig
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 7d739adcd..41eb39822 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -477,6 +477,7 @@ let s:filename_checks = {
\ 'sqlj': ['file.sqlj'],
\ 'sqr': ['file.sqr', 'file.sqi'],
\ 'squid': ['squid.conf'],
+ \ 'squirrel': ['file.nut'],
\ 'srec': ['file.s19', 'file.s28', 'file.s37', 'file.mot', 'file.srec'],
\ 'sshconfig': ['ssh_config', '/.ssh/config', '/etc/ssh/ssh_config.d/file.conf', 'any/etc/ssh/ssh_config.d/file.conf', 'any/.ssh/config'],
\ 'sshdconfig': ['sshd_config', '/etc/ssh/sshd_config.d/file.conf', 'any/etc/ssh/sshd_config.d/file.conf'],
diff --git a/src/version.c b/src/version.c
index 0aadf4b49..2923f2d5b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3729,
+/**/
3728,
/**/
3727,