Merge pull request #145 from patricoferris/5.2.0minus-9

5.2.0minus 9

Author: dkalinichenko-js

dot-merlin-reader.opam

@@ -1,4 +1,5 @@
 opam-version: "2.0"
+version: "5.2.1-502+jst"
 maintainer:   "[email protected]"
 authors:      "The Merlin team"
 synopsis:     "Reads config files for merlin"

merlin-lib.opam

@@ -1,4 +1,5 @@
 opam-version: "2.0"
+version: "5.2.1-502+jst"
 maintainer:   "[email protected]"
 authors:      "The Merlin team"
 homepage:     "https://github.com/ocaml/merlin"

merlin.opam

@@ -1,4 +1,5 @@
 opam-version: "2.0"
+version: "5.2.1-502+jst"
 maintainer:   "[email protected]"
 authors:      "The Merlin team"
 homepage:     "https://github.com/ocaml/merlin"

ocaml-index.opam

@@ -1,5 +1,6 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
+version: "5.2.1-502+jst"
 synopsis: "A tool that indexes value usages from cmt files"
 description:
   "ocaml-index should integrate with the build system to index codebase and allow tools such as Merlin to perform project-wide occurrences queries."

src/kernel/dune

@@ -4,9 +4,6 @@
 (rule
  (copy# ../ocaml/driver/pparse.mli pparse.mli))
 
-(rule
- (copy# ../runtime/float32.c float32.c))
-
 (library
  (name merlin_kernel)
  (public_name merlin-lib.kernel)
@@ -21,8 +18,7 @@
   -open Merlin_extend)
  (libraries merlin_config os_ipc ocaml_parsing ocaml_preprocess ocaml_typing
             ocaml_utils merlin_extend merlin_specific merlin_utils
-            merlin_dot_protocol merlin_index_format unix str)
- (foreign_stubs (language c) (names float32)))
+            merlin_dot_protocol merlin_index_format unix str))
 
 (rule
  (targets standard_library.ml)

src/ocaml/parsing/msupport_parsing.ml

@@ -1,4 +1,4 @@
 (* Filled in from Msupport. *)
-let msupport_raise_error : (exn -> unit) ref = ref raise
+let msupport_raise_error : (exn -> unit) ref = ref (fun x -> raise x)
 
 let raise_error exn = !msupport_raise_error exn