diff --git a/modules/prelude-ocaml.el b/modules/prelude-ocaml.el index 913530e..a9254fa 100644 --- a/modules/prelude-ocaml.el +++ b/modules/prelude-ocaml.el @@ -38,8 +38,6 @@ (require 'utop) (require 'merlin) -(add-hook 'tuareg-mode-hook 'tuareg-imenu-set-imenu) - (setq auto-mode-alist (append '(("\\.ml[ily]?\\'" . tuareg-mode) ("\\.topml\\'" . tuareg-mode)) @@ -50,6 +48,13 @@ (add-hook 'tuareg-mode-hook 'utop-setup-ocaml-buffer) (add-hook 'tuareg-mode-hook 'merlin-mode) +;; Setup merlin completions company is used by default in prelude +(add-to-list 'company-backends 'merlin-company-backend) + +;; But merlin also offers support for autocomplete, uncomment this next line +;; to activate it. +;; (setq merlin-use-auto-complete-mode t) + (setq utop-command "opam config exec \"utop -emacs\"" merlin-error-after-save nil)