# HG changeset patch
# User Marc Weber <marco-oweber@gmx.de>
# Date 1372460582 -7200
#      Sat Jun 29 01:03:02 2013 +0200
# Node ID a3d25ecc326f37a05685b8946b63faa397bf2e26
# Parent  ed4edcdeff2b124f4144463ab569a34addf2128f
move ocaml errorformat to compiler

diff -r ed4edcdeff2b -r a3d25ecc326f runtime/compiler/ocaml.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/runtime/compiler/ocaml.vim	Sat Jun 29 01:03:02 2013 +0200
@@ -0,0 +1,25 @@
+" setting makeprg doesn't make sense, because there is ocamlc and ocamlopt,
+" which one is used more often !?
+"
+" This error format was moved from ftplugin/ocaml.vim to this file,
+" because ftplugin is the wrong file to set an error format
+" and the error format itself is annoying because it joins mayn lines in the 
+"
+" Error: The implementation foo.ml does not match the interface foo.cmi:
+" Modules do not match case.
+"
+" So having it here makes people opt-in
+
+CompilerSet errorformat =
+      \%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,
+      \%Wocamlyacc:\ w\ -\ %m,
+      \%-Zmake%.%#,
+      \%C%m,
+      \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
+      \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
+      \%D%*\\a:\ Entering\ directory\ `%f',
+      \%X%*\\a:\ Leaving\ directory\ `%f',
+      \%DMaking\ %*\\a\ in\ %f
diff -r ed4edcdeff2b -r a3d25ecc326f runtime/ftplugin/ocaml.vim
--- a/runtime/ftplugin/ocaml.vim	Fri Jun 28 23:04:42 2013 +0200
+++ b/runtime/ftplugin/ocaml.vim	Sat Jun 29 01:03:02 2013 +0200
@@ -13,6 +13,9 @@
 "              (Pierre Vittet)
 "              2010 Jul 10 - Bugfix, thanks to Pat Rondon
 "              2008 Jul 17 - Bugfix related to fnameescape (VA)
+"
+" comment: This file may contain a lot of (very custom) stuff which eventually
+" should be moved somewhere else ..
 
 if exists("b:did_ftplugin")
   finish
@@ -33,19 +36,6 @@
 " Error handling -- helps moving where the compiler wants you to go
 let s:cposet=&cpoptions
 set cpo&vim
-setlocal efm=
-      \%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,
-      \%Wocamlyacc:\ w\ -\ %m,
-      \%-Zmake%.%#,
-      \%C%m,
-      \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
-      \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
-      \%D%*\\a:\ Entering\ directory\ `%f',
-      \%X%*\\a:\ Leaving\ directory\ `%f',
-      \%DMaking\ %*\\a\ in\ %f
 
 " Add mappings, unless the user didn't want this.
 if !exists("no_plugin_maps") && !exists("no_ocaml_maps")