TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ocaml: fix flycheck

Browse source 
but keep it disabled (need to test interaction with auto-complete and company)
This commit is contained in:
Török Edwin 2015-05-22 21:38:15 +03:00 committed by syl20bnr
parent 264a3c2019
commit ab1a1eae60
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
contrib/!lang/ocaml/packages.el
View file

@ -14,8 +14,8 @@
'(
;; auto-complete
company
flycheck
flycheck-ocaml
;; flycheck
;; flycheck-ocaml
merlin
ocp-indent
tuareg
@ -29,16 +29,19 @@
(spacemacs|add-company-hook merlin-mode))
(when (configuration-layer/layer-usedp 'syntax-checking)
(defun ocaml/post-init-flycheck ()
(add-hook 'merlin-mode-hook 'flycheck-mode))
(defun ocaml/init-flycheck-ocaml ()
(use-package flycheck-ocaml
:if (configuration-layer/package-usedp 'flycheck)
:defer t
:init
(progn
(add-to-hook 'merlin-mode-hook '(flycheck-mode
flycheck-ocaml-setup))
(eval-after-load 'merlin
(setq merlin-use-auto-complete-mode nil))))))
(with-eval-after-load 'merlin
(progn
(setq merlin-error-after-save nil)
(flycheck-ocaml-setup))
)))))
(defun ocaml/init-merlin ()
(use-package merlin