lang/ocaml: disable merlin when lsp is active (#1939)

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
This commit is contained in:
Rudi Grinberg 2019-10-23 14:38:13 +09:00 committed by Henrik Lissner
parent 125a74e020
commit b19178280d

View file

@ -2,12 +2,14 @@
;;; lang/ocaml/packages.el ;;; lang/ocaml/packages.el
(package! tuareg) (package! tuareg)
(unless (featurep! +lsp)
(package! merlin) (package! merlin)
(package! merlin-eldoc) (package! merlin-eldoc)
(package! ocp-indent)
(when (featurep! :tools flycheck) (when (featurep! :tools flycheck)
(package! flycheck-ocaml)) (package! flycheck-ocaml)))
(package! ocp-indent)
(when (featurep! :tools eval) (when (featurep! :tools eval)
(package! utop)) (package! utop))