From b19178280d1f7643dc025481f15c757ce0b9ae14 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 23 Oct 2019 14:38:13 +0900 Subject: [PATCH] lang/ocaml: disable merlin when lsp is active (#1939) Signed-off-by: Rudi Grinberg --- modules/lang/ocaml/packages.el | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/lang/ocaml/packages.el b/modules/lang/ocaml/packages.el index 28c8f99bc..a3e38a112 100644 --- a/modules/lang/ocaml/packages.el +++ b/modules/lang/ocaml/packages.el @@ -2,12 +2,14 @@ ;;; lang/ocaml/packages.el (package! tuareg) -(package! merlin) -(package! merlin-eldoc) -(package! ocp-indent) -(when (featurep! :tools flycheck) - (package! flycheck-ocaml)) +(unless (featurep! +lsp) + (package! merlin) + (package! merlin-eldoc) + (when (featurep! :tools flycheck) + (package! flycheck-ocaml))) + +(package! ocp-indent) (when (featurep! :tools eval) (package! utop))