Merge pull request #1888 from rgrinberg/tweak-ocaml-config

lang/ocaml: remove .merlin file detection
This commit is contained in:
Henrik Lissner 2019-10-12 23:52:00 -04:00 committed by GitHub
commit 35db55d589
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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))