From cb7655f1890916420f3d9c0f02d28fd012df6b55 Mon Sep 17 00:00:00 2001 From: Ramakrishnan Muthukrishnan Date: Fri, 31 Oct 2014 17:23:35 +0530 Subject: [PATCH] more ocaml --- init.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index 9a2f2bb..7ca43b9 100644 --- a/init.el +++ b/init.el @@ -82,5 +82,10 @@ (autoload 'utop-setup-ocaml-buffer "utop" "Toplevel for OCaml" t) (add-hook 'tuareg-mode-hook 'utop-setup-ocaml-buffer) (add-hook 'tuareg-mode-hook 'merlin-mode) -(setq merlin-use-auto-complete-mode t) +;; Start merlin on ocaml files +(add-hook 'caml-mode-hook 'merlin-mode t) +;; Enable auto-complete +(setq merlin-use-auto-complete-mode 'easy) +;; Use opam switch to lookup ocamlmerlin binary +(setq merlin-command 'opam) (setq merlin-error-after-save nil) -- 2.37.2