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

Remove detection for .merlin files

Browse source 
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 <rudi.grinberg@gmail.com>
This commit is contained in:
Rudi Grinberg 2019-10-13 11:26:49 +09:00
parent 90b59d00df
commit 14b5e545c4
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))