5857e853ad
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.
43 lines
1.6 KiB
EmacsLisp
43 lines
1.6 KiB
EmacsLisp
;;; funcs.el --- ocaml Layer functions File for Spacemacs
|
|
;;
|
|
;; Copyright (c) 2012-2018 Sylvain Benner & Contributors
|
|
;;
|
|
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
|
|
;; URL: https://github.com/syl20bnr/spacemacs
|
|
;;
|
|
;; This file is not part of GNU Emacs.
|
|
;;
|
|
;;; License: GPLv3
|
|
|
|
(defun spacemacs//init-ocaml-opam ()
|
|
(if (executable-find "opam")
|
|
(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. "
|
|
"The ocaml layer won't work properly.")))))
|
|
|
|
(defun spacemacs/merlin-locate ()
|
|
(interactive)
|
|
(let ((merlin-locate-in-new-window 'never))
|
|
(merlin-locate)))
|
|
|
|
(defun spacemacs/merlin-locate-other-window ()
|
|
(interactive)
|
|
(let ((merlin-locate-in-new-window 'always))
|
|
(merlin-locate)))
|