From: Stephen Leake Date: Tue, 25 Oct 2022 09:15:13 +0000 (-0700) Subject: * lisp/progmodes/eglot.el (eglot): Ensure managed-major-mode is a list X-Git-Tag: emacs-29.0.90~1616^2~480 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=31945b6c3fcbdb6f242f0063811d2fb91e4520cd;p=emacs.git * lisp/progmodes/eglot.el (eglot): Ensure managed-major-mode is a list --- diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 71001ba6802..432631691c3 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -229,7 +229,7 @@ language-server/bin/php-language-server.php")) (html-mode . ,(eglot-alternatives '(("vscode-html-language-server" "--stdio") ("html-languageserver" "--stdio")))) (json-mode . ,(eglot-alternatives '(("vscode-json-language-server" "--stdio") ("json-languageserver" "--stdio")))) (dockerfile-mode . ("docker-langserver" "--stdio")) - ((clojure-mode clojurescript-mode clojurec-mode) + ((clojure-mode clojurescript-mode clojurec-mode) . ("clojure-lsp")) (csharp-mode . ("omnisharp" "-lsp")) (purescript-mode . ("purescript-language-server" "--stdio")) @@ -1078,6 +1078,7 @@ MANAGED-MAJOR-MODE, which matters to a minority of servers. INTERACTIVE is t if called interactively." (interactive (append (eglot--guess-contact t) '(t))) + (setq managed-major-mode (eglot--ensure-list managed-mode)) (let* ((current-server (eglot-current-server)) (live-p (and current-server (jsonrpc-running-p current-server)))) (if (and live-p @@ -2898,7 +2899,7 @@ for which LSP on-type-formatting should be requested." (defun eglot--hover-info (contents &optional _range) (mapconcat #'eglot--format-markup (if (vectorp contents) contents (list contents)) "\n")) - + (defun eglot--sig-info (sigs active-sig sig-help-active-param) (cl-loop for (sig . moresigs) on (append sigs nil) for i from 0