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

Tuareg utop integration

modules/prelude-ocaml.el

@@ -43,11 +43,14 @@
                 ("\\.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)
 
+(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
 (add-to-list 'company-backends 'merlin-company-backend)