From f7ce419265790dad41a35370db8a16d18051a920 Mon Sep 17 00:00:00 2001
From: Valentin Robert <valentin.robert.42@gmail.com>
Date: Tue, 27 Jun 2017 11:39:15 -0700
Subject: [PATCH] Added lang/ocaml

---
 init.example.el                |  1 +
 modules/lang/ocaml/config.el   | 14 ++++++++++++++
 modules/lang/ocaml/packages.el |  5 +++++
 3 files changed, 20 insertions(+)
 create mode 100644 modules/lang/ocaml/config.el
 create mode 100644 modules/lang/ocaml/packages.el

diff --git a/init.example.el b/init.example.el
index b9cc48f8b..48d2e8b70 100644
--- a/init.example.el
+++ b/init.example.el
@@ -88,6 +88,7 @@
        latex           ; writing papers in Emacs has never been so fun
        lua             ; one-based indices? one-based indices
        markdown        ; writing docs for people to ignore
+       ocaml           ; an objective camel
        org             ; for organized fearless leader (WIP)
        php             ; make php less awful to work with
        purescript      ; javascript, but functional
diff --git a/modules/lang/ocaml/config.el b/modules/lang/ocaml/config.el
new file mode 100644
index 000000000..1a614502f
--- /dev/null
+++ b/modules/lang/ocaml/config.el
@@ -0,0 +1,14 @@
+;;; lang/ocaml/config.el
+
+(def-package! tuareg
+  :mode (("\\.ml$"  . tuareg-mode)
+         ("\\.mll$" . tuareg-mode)
+         ("\\.mly$" . tuareg-mode))
+  :config
+)
+
+(def-package! merlin
+  :after tuareg
+  :config
+  (add-hook! 'tuareg-mode-hook #'merlin-mode)
+)
diff --git a/modules/lang/ocaml/packages.el b/modules/lang/ocaml/packages.el
new file mode 100644
index 000000000..3da213bfd
--- /dev/null
+++ b/modules/lang/ocaml/packages.el
@@ -0,0 +1,5 @@
+;; -*- no-byte-compile: t; -*-
+;;; lang/ocaml/packages.el
+
+(package! tuareg)
+(package! merlin)