summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 629e697b1..b4a956418 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1911,6 +1911,9 @@ au BufNewFile,BufRead *.sst.meta,*.-sst.meta,*._sst.meta setf sisu
" SKILL
au BufNewFile,BufRead *.il,*.ils,*.cdf setf skill
+" Cadence
+au BufNewFile,BufRead *.cdc setf cdc
+
" SLRN
au BufNewFile,BufRead .slrnrc setf slrnrc
au BufNewFile,BufRead *.score setf slrnsc
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 1f9aae65a..9cbc5852c 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -521,6 +521,7 @@ let s:filename_checks = {
\ 'sinda': ['file.sin', 'file.s85'],
\ 'sisu': ['file.sst', 'file.ssm', 'file.ssi', 'file.-sst', 'file._sst', 'file.sst.meta', 'file.-sst.meta', 'file._sst.meta'],
\ 'skill': ['file.il', 'file.ils', 'file.cdf'],
+ \ 'cdc': ['file.cdc'],
\ 'slang': ['file.sl'],
\ 'slice': ['file.ice'],
\ 'slpconf': ['/etc/slp.conf', 'any/etc/slp.conf'],
diff --git a/src/version.c b/src/version.c
index cdca15168..d18585248 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 */
/**/
+ 1281,
+/**/
1280,
/**/
1279,