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

ocaml: comment out auto-complete initialization code

Browse source 
to make sure only one completion engine is active
This commit is contained in:
Török Edwin 2015-05-24 21:56:33 +03:00 committed by syl20bnr
parent f23aa2b0da
commit e57c8aa095
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,8 +22,8 @@
utop
))
(defun ocaml/post-init-auto-complete ()
(spacemacs|enable-auto-complete merlin-mode))
;;(defun ocaml/post-init-auto-complete ()
;; (spacemacs|enable-auto-complete merlin-mode))
(defun ocaml/post-init-company ()
(spacemacs|add-company-hook merlin-mode))
@ -49,7 +49,8 @@
:init
(progn
(add-hook 'tuareg-mode-hook 'merlin-mode)
(set-default 'merlin-use-auto-complete-mode t)
;; (set-default 'merlin-use-auto-complete-mode t)
(set-default 'merlin-use-auto-complete-mode nil)
(setq merlin-completion-with-doc t)
(push 'merlin-company-backend company-backends-merlin-mode)
(evil-leader/set-key-for-mode 'tuareg-mode