projects
/
.emacs.d.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fe8da0f
)
more ocaml
author
Ramakrishnan Muthukrishnan
<ram@rkrishnan.org>
Fri, 31 Oct 2014 11:53:35 +0000
(17:23 +0530)
committer
Ramakrishnan Muthukrishnan
<ram@rkrishnan.org>
Fri, 31 Oct 2014 11:53:35 +0000
(17:23 +0530)
init.el
patch
|
blob
|
history
diff --git
a/init.el
b/init.el
index 9a2f2bbb267e0e065f04539cb6168cdca5b4cba5..7ca43b9294ba3d84e4df27f561b83670abd67fd3 100644
(file)
--- 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)