From 1011fccaba13b0f7306f7228465212f04b94f6fa Mon Sep 17 00:00:00 2001 From: Geoff Shannon Date: Thu, 11 Dec 2014 11:00:31 -0500 Subject: [PATCH] Update default opam commands to newest syntax 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). --- modules/prelude-ocaml.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/prelude-ocaml.el b/modules/prelude-ocaml.el index 28cca42..c3da0cc 100644 --- a/modules/prelude-ocaml.el +++ b/modules/prelude-ocaml.el @@ -75,7 +75,7 @@ (define-key tuareg-mode-map (kbd "C-c C-s") 'utop) (setq compile-command - "opam config exec \"corebuild \"")))) + "opam config exec corebuild ")))) ;; Setup merlin completions company is used by default in prelude (add-to-list 'company-backends 'merlin-company-backend) @@ -84,7 +84,7 @@ ;; to activate it. ;; (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) (provide 'prelude-ocaml)