From: Steve Purcell <steve@sanityinc.com>
Date: Sun, 25 Apr 2021 22:51:44 +0000 (+1200)
Subject: Switch default langserver for ocaml to ocamllsp
X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~142
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f3e2ca5bd5f4ee3f5a32e85dc9cb27eaa982b41b;p=emacs.git

Switch default langserver for ocaml to ocamllsp

The repo for ocaml-language-server has been archived and inactive
for quite some time:

   https://github.com/ocaml-lsp/ocaml-language-server

Meanwhile, ocaml-lsp is the generally-preferred option, and is actively
maintained in the ocaml org itself:

   https://github.com/ocaml/ocaml-lsp/

* eglot.el (eglot-server-programs): switch caml-mode  entry.

GitHub-reference: close https://github.com/joaotavora/eglot/issues/677
---

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 3373be2256c..3348054264b 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -105,7 +105,7 @@
 language-server/bin/php-language-server.php"))
                                 ((c++-mode c-mode) . ("ccls"))
                                 ((caml-mode tuareg-mode reason-mode)
-                                 . ("ocaml-language-server" "--stdio"))
+                                 . ("ocamllsp"))
                                 (ruby-mode
                                  . ("solargraph" "socket" "--port" :autoport))
                                 (haskell-mode