summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmaan Qureshi <amaanq12@gmail.com>2023-01-22 13:10:39 +0000
committerBram Moolenaar <Bram@vim.org>2023-01-22 13:10:39 +0000
commit040e795e8da05ff38cc896528d4dcad100f0b584 (patch)
tree0f0c017166e7e60133e737a0b78a7d96c8f6e2c9
parent145a6afe3a4be54689af5233710c85346ba1e5da (diff)
patch 9.0.1229: Cap'n Proto files are not recognizedv9.0.1229
Problem: Cap'n Proto files are not recognized. Solution: Add a pattern and the "capnp" filetype. (Amaan Qureshi, closes #11862)
-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 dcd83b4e1a..fae19b9f8c 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -277,6 +277,9 @@ au BufNewFile,BufRead *.lpc,*.ulpc setf lpc
" Calendar
au BufNewFile,BufRead calendar setf calendar
+" Cap'n Proto
+au BufNewFile,BufRead *.capnp setf capnp
+
" C#
au BufNewFile,BufRead *.cs,*.csx setf cs
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index b58fb400d2..0efdf9632c 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -96,6 +96,7 @@ let s:filename_checks = {
\ 'cabalconfig': ['cabal.config'],
\ 'cabalproject': ['cabal.project', 'cabal.project.local'],
\ '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'],
\ 'cdl': ['file.cdl'],
\ 'cdrdaoconf': ['/etc/cdrdao.conf', '/etc/defaults/cdrdao', '/etc/default/cdrdao', '.cdrdao', 'any/etc/cdrdao.conf', 'any/etc/default/cdrdao', 'any/etc/defaults/cdrdao'],
diff --git a/src/version.c b/src/version.c
index 361567b257..80d8444ef6 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 */
/**/
+ 1229,
+/**/
1228,
/**/
1227,