summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-06-30 16:25:21 +0100
committerBram Moolenaar <Bram@vim.org>2022-06-30 16:25:21 +0100
commitcdbfc6dbab1d63aa56af316d6b13e37939e7f7a8 (patch)
treeaf16e32444f170534f389fdefcac4f90409277f9 /src
parentd25f003342aca9889067f2e839963dfeccf1fe05 (diff)
patch 9.0.0012: signature files not detected properlyv9.0.0012
Problem: Signature files not detected properly. Solution: Add a function to better detect signature files. (Doug Kearns)
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_filetype.vim56
-rw-r--r--src/version.c2
2 files changed, 57 insertions, 1 deletions
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index d8ddeff250..eba95cf129 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -313,7 +313,6 @@ let s:filename_checks = {
\ 'lotos': ['file.lot', 'file.lotos'],
\ 'lout': ['file.lou', 'file.lout'],
\ 'lpc': ['file.lpc', 'file.ulpc'],
- \ 'lprolog': ['file.sig'],
\ 'lsl': ['file.lsl'],
\ 'lss': ['file.lss'],
\ 'lua': ['file.lua', 'file.rockspec', 'file.nse'],
@@ -1760,4 +1759,59 @@ func Test_cls_file()
filetype off
endfunc
+func Test_sig_file()
+ filetype on
+
+ call writefile(['this is neither Lambda Prolog nor SML'], 'Xfile.sig')
+ split Xfile.sig
+ call assert_equal('', &filetype)
+ bwipe!
+
+ " Test dist#ft#FTsig()
+
+ let g:filetype_sig = 'sml'
+ split Xfile.sig
+ call assert_equal('sml', &filetype)
+ bwipe!
+ unlet g:filetype_sig
+
+ " Lambda Prolog
+
+ call writefile(['sig foo.'], 'Xfile.sig')
+ split Xfile.sig
+ call assert_equal('lprolog', &filetype)
+ bwipe!
+
+ call writefile(['/* ... */'], 'Xfile.sig')
+ split Xfile.sig
+ call assert_equal('lprolog', &filetype)
+ bwipe!
+
+ call writefile(['% ...'], 'Xfile.sig')
+ split Xfile.sig
+ call assert_equal('lprolog', &filetype)
+ bwipe!
+
+ " SML signature file
+
+ call writefile(['signature FOO ='], 'Xfile.sig')
+ split Xfile.sig
+ call assert_equal('sml', &filetype)
+ bwipe!
+
+ call writefile(['structure FOO ='], 'Xfile.sig')
+ split Xfile.sig
+ call assert_equal('sml', &filetype)
+ bwipe!
+
+ call writefile(['(* ... *)'], 'Xfile.sig')
+ split Xfile.sig
+ call assert_equal('sml', &filetype)
+ bwipe!
+
+ call delete('Xfile.sig')
+ filetype off
+endfunc
+
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 11fd817ed0..116113bbb6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 12,
+/**/
11,
/**/
10,