From 8fc68d8edb9034db56c30b9afcec01ba71856dbe Mon Sep 17 00:00:00 2001 From: William Carroll Date: Sun, 22 Dec 2019 21:01:15 +0000 Subject: [PATCH] Update OCaml support After attempting to run OCaml on a separate machine, I realized that I needed to update the documentation in my wpc-ocaml package. --- configs/shared/.emacs.d/opam-user-setup.el | 4 ++-- configs/shared/.emacs.d/wpc/packages/wpc-ocaml.el | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/shared/.emacs.d/opam-user-setup.el b/configs/shared/.emacs.d/opam-user-setup.el index 3c7af326a..a23addefa 100644 --- a/configs/shared/.emacs.d/opam-user-setup.el +++ b/configs/shared/.emacs.d/opam-user-setup.el @@ -120,11 +120,11 @@ (opam-auto-tools-setup) ;; ## end of OPAM user-setup addition for emacs / base ## keep this line -;; ## added by OPAM user-setup for emacs / tuareg ## 02c044af5abd4321e32578768beeca77 ## you can edit, but keep this line +;; ## added by OPAM user-setup for emacs / tuareg ## b10f42abebd2259b784b70d1a7f7e426 ## you can edit, but keep this line ;; Set to autoload tuareg from its original switch when not found in current ;; switch (don't load tuareg-site-file as it adds unwanted load-paths) (defun opam-tuareg-autoload (fct file doc args) - (let ((load-path (cons "/usr/local/google/home/wpcarro/.opam/4.08.0/share/emacs/site-lisp" load-path))) + (let ((load-path (cons "/home/wpcarro/.opam/default/share/emacs/site-lisp" load-path))) (load file)) (apply fct args)) (when (not (member "tuareg" opam-tools-installed)) diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-ocaml.el b/configs/shared/.emacs.d/wpc/packages/wpc-ocaml.el index 3b898d32b..8bd1c63f6 100644 --- a/configs/shared/.emacs.d/wpc/packages/wpc-ocaml.el +++ b/configs/shared/.emacs.d/wpc/packages/wpc-ocaml.el @@ -7,7 +7,7 @@ ;; Dependencies: ;; - `opam install tuareg` ;; - `opam install merlin` -;; - `opam install user-setup` +;; - `opam install user-setup && opam user-setup install` ;; - `opam install ocamlformat` ;;; Code: