Some love for OCaml editing

superbobry · Oct 15, 2014 · 21c8790 · 21c8790
1 parent c95d380
commit 21c8790
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/rc/rc-editor.el b/rc/rc-editor.el
@@ -266,4 +266,8 @@
   :bind ("C-=" . er/expand-region))
 
 
+(when (functionp 'global-prettify-symbols-mode)
+  (global-prettify-symbols-mode 1))
+
+
 ;;; rc-editor.el ends here
diff --git a/rc/rc-languages.el b/rc/rc-languages.el
@@ -93,7 +93,7 @@
                                hi2-left-offset 4
                                hi2-ifte-offset 4)
 
-                         ;; (haskell-indent-mode -1)
+                         (haskell-indent-mode -1)
                          (hi2-mode)))))
 
 (use-package ghci-completion
@@ -103,27 +103,21 @@
 
 ;; OCaml
 
-(when (executable-find "opam")
-  (add-to-list 'load-path
-               (concat
-                (replace-regexp-in-string
-                 "\n$" ""
-                 (shell-command-to-string "opam config var share"))
-                "/emacs/site-lisp"))
-
-  (let* ((opam-prefix
-          (substring (shell-command-to-string "opam config var prefix") 0 -1)))
-    (with-temp-buffer
-      (insert (shell-command-to-string
-               (concat opam-prefix
-                       "/bin/ocp-edit-mode emacs -load-global-config")))
-      (eval-buffer)))
-
-  (require 'ocp-indent)
-  ;; only supports autocomplete :(
-  ;; (require 'ocp-index)
-  (require 'tuareg)
-  (setq ocp-indent-config "with_never=true"))
+(use-package tuareg
+  :ensure tuareg
+  :commands tuareg-mode
+  :config
+  (when (executable-find "opam")
+    (add-to-list 'load-path
+                 (concat
+                  (replace-regexp-in-string
+                   "\n$" ""
+                   (shell-command-to-string "opam config var share"))
+                  "/emacs/site-lisp"))
+
+    (require 'ocp-indent)
+    (require 'ocp-index)
+    (setq ocp-indent-config "with_never=true")))
 
 
 ;; Coffee