Commit 905f8da1 authored by treyzania's avatar treyzania

More OCaml things, did it right this time.

parent e82be185
......@@ -234,15 +234,23 @@
;;; OCaml
;; Set the Emacs source path for OPAM things.
(setq opam-site-path
(concat (getenv "HOME")
"/.opam/4.09.0/share/emacs/site-lisp"))
(defvar opam-site-path
(concat (getenv "HOME")
"/.opam/4.09.0/share/emacs/site-lisp"))
(use-package tuareg
:ensure t)
;; idrk what this does
(push opam-site-path load-path)
(use-package tuareg
:ensure t)
(use-package ocamlformat
:hook
(tuareg-mode . (lambda ()
(define-key tuareg-mode-map (kbd "C-M-<tab>") #'ocamlformat)
(add-hook 'before-save-hook #'ocamlformat-before-save))))
(autoload 'merlin-mode "merlin" "Merlin mode" t)
(add-hook 'tuareg-mode-hook 'merlin-mode)
(add-hook 'caml-mode-hook 'merlin-mode)
......@@ -296,3 +304,6 @@
(put 'scroll-left 'disabled nil)
(setq custom-file (substitute-in-file-name "$HOME/.emacs.d/.custom.el"))
;; ## added by OPAM user-setup for emacs / base ## 56ab50dc8996d2bb95e7856a6eddb17b ## you can edit, but keep this line
(require 'opam-user-setup "~/.emacs.d/opam-user-setup.el")
;; ## end of OPAM user-setup addition for emacs / base ## keep this line
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment