maciej/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add haskell mode, update ocaml mode

Browse source
This commit is contained in:
Maciej 2020-08-08 23:34:56 +03:00
parent 005fb4fcfb
commit c169983db6
Signed by: maciej
GPG key ID: 41D62D42D3B0D765
9 changed files with 74 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

33
languages/ocaml.el
View file

@ -3,10 +3,10 @@
;;; Code:
(use-package tuareg
:defer t
:ensure t
:config
(add-hook 'tuareg-mode-hook 'merlin-mode))
:defer t
:ensure t
:config
(add-hook 'tuareg-mode-hook 'merlin-mode))
(use-package merlin
:defer t
@ -17,16 +17,27 @@
:ensure t
:config (setq refmt-command 'opam))
(let ((opam-share (ignore-errors (car (process-lines "opam" "config" "var" "share")))))
(when (and opam-share (file-directory-p opam-share))
;; Register Merlin
(add-to-list 'load-path (expand-file-name "emacs/site-lisp" opam-share))
(autoload 'merlin-mode "merlin" nil t nil)
;; Use opam switch to lookup ocamlmerlin binary
(setq merlin-command 'opam)))
(use-package dune
:defer t
:ensure t)
(defun load-ocaml-site-packages ()
"Generate ocaml config."
(let ((opam-share (ignore-errors (car (process-lines "opam" "config" "var" "share")))))
(when (and opam-share (file-directory-p opam-share))
;; Register Merlin
(add-to-list 'load-path (expand-file-name "emacs/site-lisp" opam-share))
(autoload 'merlin-mode "merlin" nil t nil)
(autoload 'ocamlformat "ocamlformat" nil t nil)
(autoload 'utop "utop" nil t nil)
(autoload 'dune "dune" nil t nil)
;; Use opam switch to lookup ocamlmerlin binary
(setq merlin-command 'opam))))
;; OCaml setup
(add-hook 'tuareg-mode-hook 'merlin-mode)
(add-hook 'tuareg-mode-hook 'load-ocaml-site-packages)
;; Reason setup
(add-hook 'reason-mode-hook