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 bcd36b521..97b3d6450 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -439,6 +439,9 @@ au BufNewFile,BufRead *.cook setf cook
" needs to be inspected.
au BufNewFile,BufRead *.cql setf cqlang
+" Crystal
+au BufNewFile,BufRead *.cr setf crystal
+
" CSV Files
au BufNewFile,BufRead *.csv setf csv
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 70e79eae2..16726bb84 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -131,6 +131,7 @@ let s:filename_checks = {
\ 'cqlang': ['file.cql'],
\ 'crm': ['file.crm'],
\ 'crontab': ['crontab', 'crontab.file', '/etc/cron.d/file', 'any/etc/cron.d/file'],
+ \ 'crystal': ['file.cr'],
\ 'cs': ['file.cs', 'file.csx'],
\ 'csc': ['file.csc'],
\ 'csdl': ['file.csdl'],
diff --git a/src/version.c b/src/version.c
index 277e52258..585f72c1b 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 */
/**/
+ 1415,
+/**/
1414,
/**/
1413,