summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-01-01 13:54:00 +0100
committerBram Moolenaar <Bram@vim.org>2021-01-01 13:54:00 +0100
commitbeef4eeda5c6865fcfe46db43ae71429a2025b58 (patch)
tree5fd73a845d6c64d673ad9c74b76331c6531d1cc3
parent2949cfdbe4335b9abcfeda1be4dfc52090ee1df6 (diff)
downloadvim-git-beef4eeda5c6865fcfe46db43ae71429a2025b58.tar.gz
patch 8.2.2258: not all OCaml related files are detectedv8.2.2258
Problem: Not all OCaml related files are detected. Solution: Update OCaml file type detection. (Markus Mottl, closes #7590)
-rw-r--r--runtime/filetype.vim13
-rw-r--r--src/testdir/test_filetype.vim5
-rw-r--r--src/version.c2
3 files changed, 17 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 71ecd313f..d624e2b34 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -499,6 +499,9 @@ au BufNewFile,BufRead *.com call dist#ft#BindzoneCheck('dcl')
" DOT
au BufNewFile,BufRead *.dot,*.gv setf dot
+" Dune
+au BufNewFile,BufRead jbuild,dune,dune-project,dune-workspace setf dune
+
" Dylan - lid files
au BufNewFile,BufRead *.lid setf dylanlid
@@ -1125,8 +1128,8 @@ au BufNewFile,BufRead *.nse setf lua
" NSIS
au BufNewFile,BufRead *.nsi,*.nsh setf nsis
-" OCAML
-au BufNewFile,BufRead *.ml,*.mli,*.mll,*.mly,.ocamlinit setf ocaml
+" OCaml
+au BufNewFile,BufRead *.ml,*.mli,*.mll,*.mly,.ocamlinit,*.mlt,*.mlp,*.mlip,*.mli.cppo,*.ml.cppo setf ocaml
" Occam
au BufNewFile,BufRead *.occ setf occam
@@ -1134,6 +1137,9 @@ au BufNewFile,BufRead *.occ setf occam
" Omnimark
au BufNewFile,BufRead *.xom,*.xin setf omnimark
+" OPAM
+au BufNewFile,BufRead opam,*.opam,*.opam.template setf opam
+
" OpenROAD
au BufNewFile,BufRead *.or setf openroad
@@ -1547,6 +1553,9 @@ au BufNewFile,BufRead *.scm,*.ss,*.rkt setf scheme
" Screen RC
au BufNewFile,BufRead .screenrc,screenrc setf screen
+" Sexplib
+au BufNewFile,BufRead *.sexp setf sexplib
+
" Simula
au BufNewFile,BufRead *.sim setf simula
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 9bc06b3d0..ea2237a76 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -153,6 +153,7 @@ let s:filename_checks = {
\ 'dsl': ['file.dsl'],
\ 'dtd': ['file.dtd'],
\ 'dts': ['file.dts', 'file.dtsi'],
+ \ 'dune': ['jbuild', 'dune', 'dune-project', 'dune-workspace'],
\ 'dylan': ['file.dylan'],
\ 'dylanintr': ['file.intr'],
\ 'dylanlid': ['file.lid'],
@@ -338,9 +339,10 @@ let s:filename_checks = {
\ 'nroff': ['file.tr', 'file.nr', 'file.roff', 'file.tmac', 'file.mom', 'tmac.file'],
\ 'nsis': ['file.nsi', 'file.nsh'],
\ 'obj': ['file.obj'],
- \ 'ocaml': ['file.ml', 'file.mli', 'file.mll', 'file.mly', '.ocamlinit'],
+ \ 'ocaml': ['file.ml', 'file.mli', 'file.mll', 'file.mly', '.ocamlinit', 'file.mlt', 'file.mlp', 'file.mlip', 'file.mli.cppo', 'file.ml.cppo'],
\ 'occam': ['file.occ'],
\ 'omnimark': ['file.xom', 'file.xin'],
+ \ 'opam': ['opam', 'file.opam', 'file.opam.template'],
\ 'openroad': ['file.or'],
\ 'ora': ['file.ora'],
\ 'pamconf': ['/etc/pam.conf', '/etc/pam.d/file', 'any/etc/pam.conf', 'any/etc/pam.d/file'],
@@ -414,6 +416,7 @@ let s:filename_checks = {
\ 'scheme': ['file.scm', 'file.ss', 'file.rkt'],
\ 'scilab': ['file.sci', 'file.sce'],
\ 'screen': ['.screenrc', 'screenrc'],
+ \ 'sexplib': ['file.sexp'],
\ 'scss': ['file.scss'],
\ 'sd': ['file.sd'],
\ 'sdc': ['file.sdc'],
diff --git a/src/version.c b/src/version.c
index f5d57e287..92d4573fe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2258,
+/**/
2257,
/**/
2256,