summaryrefslogtreecommitdiffstats
path: root/runtime/compiler
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-07-04 17:22:06 +0200
committerBram Moolenaar <Bram@vim.org>2019-07-04 17:22:06 +0200
commit790c18bfa5dfeca51749b752dddc41e60cb3fa54 (patch)
tree2a9e58a44299c06ebee566a43055754720dfc415 /runtime/compiler
parent6bf2c6264b5ebbe4981751840c5a8b69da08e744 (diff)
Update runtime files
Diffstat (limited to 'runtime/compiler')
-rw-r--r--runtime/compiler/ocaml.vim18
1 files changed, 14 insertions, 4 deletions
diff --git a/runtime/compiler/ocaml.vim b/runtime/compiler/ocaml.vim
index da15bce8fe..7f8a7eab67 100644
--- a/runtime/compiler/ocaml.vim
+++ b/runtime/compiler/ocaml.vim
@@ -1,7 +1,11 @@
" Vim Compiler File
-" Compiler: ocaml
-" Maintainer: See ftplugin/ocaml.vim (?)
-" Last Change: June 2013 by Marc Weber
+" Compiler: ocaml
+" Maintainer: Markus Mottl <markus.mottl@gmail.com>
+" URL: https://github.com/rgrinberg/vim-ocaml
+" Last Change:
+" 2017 Nov 26 - Improved error format (Markus Mottl)
+" 2013 Aug 27 - Added a new OCaml error format (Markus Mottl)
+" 2013 Jun 30 - Initial version (Marc Weber)
"
" Marc Weber's comments:
" Setting makeprg doesn't make sense, because there is ocamlc, ocamlopt,
@@ -17,7 +21,6 @@
"
" So having it here makes people opt-in
-
if exists("current_compiler")
finish
endif
@@ -28,6 +31,7 @@ set cpo&vim
CompilerSet errorformat =
\%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d:,
+ \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d\ %.%#,
\%EFile\ \"%f\"\\,\ line\ %l\\,\ character\ %c:%m,
\%+EReference\ to\ unbound\ regexp\ name\ %m,
\%Eocamlyacc:\ e\ -\ line\ %l\ of\ \"%f\"\\,\ %m,
@@ -38,6 +42,12 @@ CompilerSet errorformat =
\%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
\%D%*\\a:\ Entering\ directory\ `%f',
\%X%*\\a:\ Leaving\ directory\ `%f',
+ \%D%*\\a[%*\\d]:\ Entering\ directory\ '%f',
+ \%X%*\\a[%*\\d]:\ Leaving\ directory\ '%f',
+ \%D%*\\a:\ Entering\ directory\ '%f',
+ \%X%*\\a:\ Leaving\ directory\ '%f',
+ \%DEntering\ directory\ '%f',
+ \%XLeaving\ directory\ '%f',
\%DMaking\ %*\\a\ in\ %f
let &cpo = s:cpo_save