emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/lang/ocaml/config.el
View file

@ -65,12 +65,11 @@
:hook (merlin-mode . +ocaml-init-flycheck-h) :hook (merlin-mode . +ocaml-init-flycheck-h)
:config :config
(defun +ocaml-init-flycheck-h () (defun +ocaml-init-flycheck-h ()
"Activate `flycheck-ocaml` if the current project possesses a .merlin file." "Activate `flycheck-ocaml`"
(when (projectile-locate-dominating-file default-directory ".merlin") ;; Disable Merlin's own error checking
;; Disable Merlin's own error checking (setq merlin-error-after-save nil)
(setq merlin-error-after-save nil) ;; Enable Flycheck checker
;; Enable Flycheck checker (flycheck-ocaml-setup)))
(flycheck-ocaml-setup))))
(use-package! merlin-eldoc (use-package! merlin-eldoc
:hook (merlin-mode . merlin-eldoc-setup)) :hook (merlin-mode . merlin-eldoc-setup))