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

Merge pull request #632 from RadicalZephyr/tuareg-utop-integration

Browse source 
Tuareg utop integration
This commit is contained in:
Bozhidar Batsov 2014-08-05 08:03:10 +03:00
parent 1b9c059c48 17d56f668d
commit ccb863fc5e
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/prelude-ocaml.el
View file

@ -43,11 +43,14 @@
("\\.topml\\'" . tuareg-mode)) ("\\.topml\\'" . tuareg-mode))
auto-mode-alist)) 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 'utop-setup-ocaml-buffer)
(add-hook 'tuareg-mode-hook 'merlin-mode) (add-hook 'tuareg-mode-hook 'merlin-mode)
(add-hook 'tuareg-mode-hook (lambda ()
(progn
(define-key tuareg-mode-map (kbd "C-c C-s")
'utop))))
;; Setup merlin completions company is used by default in prelude ;; Setup merlin completions company is used by default in prelude
(add-to-list 'company-backends 'merlin-company-backend) (add-to-list 'company-backends 'merlin-company-backend)