From 14b5e545c4a14e4eb200189c5069db3b8a49cbca Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Sun, 13 Oct 2019 11:26:49 +0900 Subject: [PATCH] Remove detection for .merlin files These files are generated and hence this detection fails if they haven't been generated yet. Merlin is essential for basically all OCaml development so there's no need for this extra check. Signed-off-by: Rudi Grinberg --- modules/lang/ocaml/config.el | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/lang/ocaml/config.el b/modules/lang/ocaml/config.el index 25b7d0cad..afd892dee 100644 --- a/modules/lang/ocaml/config.el +++ b/modules/lang/ocaml/config.el @@ -65,12 +65,11 @@ :hook (merlin-mode . +ocaml-init-flycheck-h) :config (defun +ocaml-init-flycheck-h () - "Activate `flycheck-ocaml` if the current project possesses a .merlin file." - (when (projectile-locate-dominating-file default-directory ".merlin") - ;; Disable Merlin's own error checking - (setq merlin-error-after-save nil) - ;; Enable Flycheck checker - (flycheck-ocaml-setup)))) + "Activate `flycheck-ocaml`" + ;; Disable Merlin's own error checking + (setq merlin-error-after-save nil) + ;; Enable Flycheck checker + (flycheck-ocaml-setup))) (use-package! merlin-eldoc :hook (merlin-mode . merlin-eldoc-setup))