TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Ocaml layer init without opam.

Browse source 
Currently the ocaml layer requires opam in order to work. However
opam is only really required for an easy installation of the
required ocaml binaries. The only place where opam is used
instead is to add the merlin files of the merlin installed
via opam instead of the merlin files from melp.

This commit introduces a fallback if opam is not installed but
ocamlmerlin is installed, since the melpa package of merlin
is already installed through packages.
This commit is contained in:
Bernhard Schommer 2016-11-21 10:54:41 +01:00 committed by Eivind Fonn
parent 1320f8e8fa
commit 2c193614f7
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
layers/+lang/ocaml/funcs.el
View file

@ -19,9 +19,10 @@
(setq opam-share share
opam-load-path (concat share "/emacs/site-lisp")))
(add-to-list 'load-path opam-load-path))
(spacemacs-buffer/warning
(concat "Cannot find \"opam\" executable. "
"The ocaml layer won't work properly."))))
(unless (executable-find "ocamlmerlin")
(spacemacs-buffer/warning
(concat "Cannot find \"opam\" or \"merlin\" executable. "
"The ocaml layer won't work properly.")))))
(defun spacemacs/merlin-locate ()
(interactive)