summaryrefslogtreecommitdiffstats
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 88956422a0..59cb06c3c0 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -277,6 +277,9 @@ endif
au BufNewFile,BufRead *.c call dist#ft#FTlpc()
au BufNewFile,BufRead *.lpc,*.ulpc setf lpc
+" Cairo
+au BufNewFile,BufRead *.cairo setf cairo
+
" Calendar
au BufNewFile,BufRead calendar setf calendar
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index ff438bb85d..042c25df28 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -96,6 +96,7 @@ let s:filename_checks = {
\ 'cabal': ['file.cabal'],
\ 'cabalconfig': ['cabal.config'],
\ 'cabalproject': ['cabal.project', 'cabal.project.local'],
+ \ 'cairo': ['file.cairo'],
\ 'calendar': ['calendar', '/.calendar/file', '/share/calendar/any/calendar.file', '/share/calendar/calendar.file', 'any/share/calendar/any/calendar.file', 'any/share/calendar/calendar.file'],
\ 'capnp': ['file.capnp'],
\ 'catalog': ['catalog', 'sgml.catalogfile', 'sgml.catalog', 'sgml.catalog-file'],
diff --git a/src/version.c b/src/version.c
index 9689d8b2df..3a2ff57c97 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 */
/**/
+ 1393,
+/**/
1392,
/**/
1391,