ocamlPackages.merlin: 3.3.9 -> 3.4.0

2020-10-04 16:57:52 +02:00
parent 12e5973c3f
commit 4304c709af
2 changed files with 28 additions and 8 deletions
@@ -0,0 +1,15 @@
+--- a/src/kernel/mconfig_dot.ml
+++ b/src/kernel/mconfig_dot.ml
+@@ -126,10 +126,10 @@ module Configurator = struct
+       let prog, args =
+         match cfg with
+         | Dot_merlin ->
+-          let prog = "dot-merlin-reader" in
+          let prog = "@dot_merlin_reader@" in
+           prog, [| prog |]
+         | Dune ->
+-          let prog = "dune" in
+          let prog = "@dune@" in
+           prog, [| prog; "ocaml-merlin"; "--no-print-directory" |]
+       in
+       log ~title:"get_config" "Using %s configuration provider." (to_string cfg);