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

ocaml: support both auto-complete and company

Browse source
This commit is contained in:
Török Edwin 2015-05-22 21:41:48 +03:00 committed by syl20bnr
parent 549b18a97e
commit 264a3c2019
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@
(setq ocaml-packages
'(
;; auto-complete
company
flycheck
flycheck-ocaml
@ -21,6 +22,9 @@
utop
))
(defun ocaml/post-init-auto-complete ()
(spacemacs|enable-auto-complete merlin-mode))
(defun ocaml/post-init-company ()
(spacemacs|add-company-hook merlin-mode))
@ -42,8 +46,7 @@
:init
(progn
(add-hook 'tuareg-mode-hook 'merlin-mode)
;; disable integration with auto-complete, we use flycheck
(set-default 'merlin-use-auto-complete-mode nil)
(set-default 'merlin-use-auto-complete-mode t)
(push 'merlin-company-backend company-backends-merlin-mode)
(evil-leader/set-key-for-mode 'tuareg-mode
"met" 'merlin-type-enclosing