X-Git-Url: https://git.rkrishnan.org/?a=blobdiff_plain;f=init.el;h=9a2f2bbb267e0e065f04539cb6168cdca5b4cba5;hb=fe8da0fe2a804bee85b80b61479f7d5820d0fc88;hp=fabdc36f8232a0fb861d87e28f8511491bcf4e00;hpb=6cf16f35fd7a5a03762b556bacf8a4d54ae37707;p=.emacs.d.git

diff --git a/init.el b/init.el
index fabdc36..9a2f2bb 100644
--- a/init.el
+++ b/init.el
@@ -72,3 +72,15 @@
 
 ;; haskell mode
 (add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
+
+;; ocaml
+(add-hook 'tuareg-mode-hook 'tuareg-imenu-set-imenu)
+(setq auto-mode-alist
+      (append '(("\\.ml[ily]?$" . tuareg-mode)
+                ("\\.topml$" . tuareg-mode))
+              auto-mode-alist))
+(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)
+(setq merlin-error-after-save nil)