awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-09-18 16:06:56 -05:00
Code Issues Packages Projects Releases 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
parent 98c80ce412 14b5e545c4
commit 35db55d589
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))