Patch 8.2.2258

[Bram Moolenaar]

Patch 8.2.2258
Problem: Not all OCaml related files are detected.
Solution: Update OCaml file type detection. (Markus Mottl, closes #7590)
Files: runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-8.2.2257/runtime/filetype.vim 2020-12-24 13:33:42.900570868 +0100
--- runtime/filetype.vim 2021-01-01 13:42:29.503320715 +0100
***************
*** 499,504 ****
--- 499,507 ----
" 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,1132 ****
" NSIS
au BufNewFile,BufRead *.nsi,*.nsh setf nsis

! " OCAML
! au BufNewFile,BufRead *.ml,*.mli,*.mll,*.mly,.ocamlinit setf ocaml

" Occam
au BufNewFile,BufRead *.occ setf occam
--- 1128,1135 ----
" NSIS
au BufNewFile,BufRead *.nsi,*.nsh setf nsis

! " 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,1139 ****
--- 1137,1145 ----
" 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

***************
*** 1546,1551 ****
--- 1553,1561 ----
" Screen RC
au BufNewFile,BufRead .screenrc,screenrc setf screen

+ " Sexplib
+ au BufNewFile,BufRead *.sexp setf sexplib
+
" Simula
au BufNewFile,BufRead *.sim setf simula

*** ../vim-8.2.2257/src/testdir/test_filetype.vim 2020-12-24 13:33:42.904570857 +0100
--- src/testdir/test_filetype.vim 2021-01-01 13:49:36.538140336 +0100
***************
*** 153,158 ****
--- 153,159 ----
\ '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,346 ****
\ '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'],
\ 'occam': ['file.occ'],
\ 'omnimark': ['file.xom', 'file.xin'],
\ 'openroad': ['file.or'],
\ 'ora': ['file.ora'],
\ 'pamconf': ['/etc/pam.conf', '/etc/pam.d/file', 'any/etc/pam.conf', 'any/etc/pam.d/file'],
--- 339,348 ----
\ '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', '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,419 ****
--- 416,422 ----
\ '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'],
*** ../vim-8.2.2257/src/version.c 2020-12-31 21:28:43.423217932 +0100
--- src/version.c 2021-01-01 13:44:03.007082400 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2258,
/**/

--
"Thou shalt not follow the Null Pointer, for at its end Chaos and
Madness lie."

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///