jt/emacs-prelude
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #624 from RadicalZephyr/prelude-ocaml-fix

Browse source 
prelude-ocaml fix
This commit is contained in:
Bozhidar Batsov 2014-07-29 00:16:38 +03:00
commit 7ece99d281
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/prelude-ocaml.el
View file

@ -38,8 +38,6 @@
(require 'utop) (require 'utop)
(require 'merlin) (require 'merlin)
(add-hook 'tuareg-mode-hook 'tuareg-imenu-set-imenu)
(setq auto-mode-alist (setq auto-mode-alist
(append '(("\\.ml[ily]?\\'" . tuareg-mode) (append '(("\\.ml[ily]?\\'" . tuareg-mode)
("\\.topml\\'" . tuareg-mode)) ("\\.topml\\'" . tuareg-mode))
@ -50,6 +48,13 @@
(add-hook 'tuareg-mode-hook 'utop-setup-ocaml-buffer) (add-hook 'tuareg-mode-hook 'utop-setup-ocaml-buffer)
(add-hook 'tuareg-mode-hook 'merlin-mode) (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\"" (setq utop-command "opam config exec \"utop -emacs\""
merlin-error-after-save nil) merlin-error-after-save nil)