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

Fix OPAM share directory in OCaml layer

Browse source 
This commit uses process-lines instead of shell-command-to-string, as
seen in ocaml/merlin#547.

This fixes an issue on Windows where the external command fails,
resulting in a broken load-path.
This commit is contained in:
Levi Roth 2017-12-07 15:24:20 -05:00 committed by syl20bnr
parent a2f16fa876
commit 5857e853ad
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,14 +11,22 @@
(defun spacemacs//init-ocaml-opam ()
(if (executable-find "opam")
(let* ((output (shell-command-to-string
"opam config var share 2> /dev/null"))
(share (when (< 0 (length output))
(substring output 0 -1))))
(when share
(setq opam-share share
opam-load-path (concat share "/emacs/site-lisp")))
(add-to-list 'load-path opam-load-path))
(let ((share (string-trim-right
(with-output-to-string
(with-current-buffer
standard-output
(process-file
shell-file-name nil '(t nil) nil shell-command-switch
"opam config var share"))))))
(cond ((string= "" share)
(spacemacs-buffer/warning
"\"opam config var shar\" output empty string."))
((not (file-directory-p share))
(spacemacs-buffer/warning
"opam share directory does not exist."))
(t (setq opam-share share
opam-load-path (concat share "/emacs/site-lisp"))
(add-to-list 'load-path opam-load-path))))
(unless (executable-find "ocamlmerlin")
(spacemacs-buffer/warning
(concat "Cannot find \"opam\" or \"merlin\" executable. "