jt/emacs-prelude
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update default opam commands to newest syntax

Browse source 
Newer versions of opam don't do argument parsing of the first argument
after `opam config exec` so everything needs to be passed as separate
arguments in the shell (i.e. unquoted).
This commit is contained in:
Geoff Shannon 2014-12-11 11:00:31 -05:00
parent 67082e77e3
commit 1011fccaba
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/prelude-ocaml.el
View file

@ -75,7 +75,7 @@
(define-key tuareg-mode-map (kbd "C-c C-s") (define-key tuareg-mode-map (kbd "C-c C-s")
'utop) 'utop)
(setq compile-command (setq compile-command
"opam config exec \"corebuild \"")))) "opam config exec corebuild "))))
;; Setup merlin completions company is used by default in prelude ;; Setup merlin completions company is used by default in prelude
(add-to-list 'company-backends 'merlin-company-backend) (add-to-list 'company-backends 'merlin-company-backend)
@ -84,7 +84,7 @@
;; to activate it. ;; to activate it.
;; (setq merlin-use-auto-complete-mode t) ;; (setq merlin-use-auto-complete-mode t)
(setq utop-command "opam config exec \"utop -emacs\"" (setq utop-command "opam config exec utop -- -emacs"
merlin-error-after-save nil) merlin-error-after-save nil)
(provide 'prelude-ocaml) (provide 'prelude-ocaml)