init-ocaml: better handling of merlin-company

lj020326 · Apr 12, 2021 · 4b16a4c · 4b16a4c
1 parent 090b799
commit 4b16a4c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lisp/init-ocaml.el b/lisp/init-ocaml.el
@@ -6,9 +6,10 @@
   (when (maybe-require-package 'merlin)
     (add-hook 'tuareg-mode-hook 'merlin-mode)
 
-    (with-eval-after-load 'merlin
-      (with-eval-after-load 'company
-        (push 'merlin-company-backend company-backends)))
+    (when (maybe-require-package 'merlin-company)
+      (with-eval-after-load 'merlin
+        (with-eval-after-load 'company
+          (push 'merlin-company-backend company-backends))))
 
     (when (maybe-require-package 'merlin-eldoc)
       (with-eval-after-load 'merlin