diff options
| author | Stephen Leake | 2022-10-25 02:15:13 -0700 |
|---|---|---|
| committer | Stephen Leake | 2022-10-25 02:15:13 -0700 |
| commit | 31945b6c3fcbdb6f242f0063811d2fb91e4520cd (patch) | |
| tree | 18bb234791b34122fd7ed300a08decaac8b5deec | |
| parent | 9bfe00dda6b59d9b93eb7a825f6e0868afa1cca3 (diff) | |
| download | emacs-31945b6c3fcbdb6f242f0063811d2fb91e4520cd.tar.gz emacs-31945b6c3fcbdb6f242f0063811d2fb91e4520cd.zip | |
* lisp/progmodes/eglot.el (eglot): Ensure managed-major-mode is a list
| -rw-r--r-- | lisp/progmodes/eglot.el | 5 |
1 files changed, 3 insertions, 2 deletions
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")) | |||
| 229 | (html-mode . ,(eglot-alternatives '(("vscode-html-language-server" "--stdio") ("html-languageserver" "--stdio")))) | 229 | (html-mode . ,(eglot-alternatives '(("vscode-html-language-server" "--stdio") ("html-languageserver" "--stdio")))) |
| 230 | (json-mode . ,(eglot-alternatives '(("vscode-json-language-server" "--stdio") ("json-languageserver" "--stdio")))) | 230 | (json-mode . ,(eglot-alternatives '(("vscode-json-language-server" "--stdio") ("json-languageserver" "--stdio")))) |
| 231 | (dockerfile-mode . ("docker-langserver" "--stdio")) | 231 | (dockerfile-mode . ("docker-langserver" "--stdio")) |
| 232 | ((clojure-mode clojurescript-mode clojurec-mode) | 232 | ((clojure-mode clojurescript-mode clojurec-mode) |
| 233 | . ("clojure-lsp")) | 233 | . ("clojure-lsp")) |
| 234 | (csharp-mode . ("omnisharp" "-lsp")) | 234 | (csharp-mode . ("omnisharp" "-lsp")) |
| 235 | (purescript-mode . ("purescript-language-server" "--stdio")) | 235 | (purescript-mode . ("purescript-language-server" "--stdio")) |
| @@ -1078,6 +1078,7 @@ MANAGED-MAJOR-MODE, which matters to a minority of servers. | |||
| 1078 | 1078 | ||
| 1079 | INTERACTIVE is t if called interactively." | 1079 | INTERACTIVE is t if called interactively." |
| 1080 | (interactive (append (eglot--guess-contact t) '(t))) | 1080 | (interactive (append (eglot--guess-contact t) '(t))) |
| 1081 | (setq managed-major-mode (eglot--ensure-list managed-mode)) | ||
| 1081 | (let* ((current-server (eglot-current-server)) | 1082 | (let* ((current-server (eglot-current-server)) |
| 1082 | (live-p (and current-server (jsonrpc-running-p current-server)))) | 1083 | (live-p (and current-server (jsonrpc-running-p current-server)))) |
| 1083 | (if (and live-p | 1084 | (if (and live-p |
| @@ -2898,7 +2899,7 @@ for which LSP on-type-formatting should be requested." | |||
| 2898 | (defun eglot--hover-info (contents &optional _range) | 2899 | (defun eglot--hover-info (contents &optional _range) |
| 2899 | (mapconcat #'eglot--format-markup | 2900 | (mapconcat #'eglot--format-markup |
| 2900 | (if (vectorp contents) contents (list contents)) "\n")) | 2901 | (if (vectorp contents) contents (list contents)) "\n")) |
| 2901 | 2902 | ||
| 2902 | (defun eglot--sig-info (sigs active-sig sig-help-active-param) | 2903 | (defun eglot--sig-info (sigs active-sig sig-help-active-param) |
| 2903 | (cl-loop | 2904 | (cl-loop |
| 2904 | for (sig . moresigs) on (append sigs nil) for i from 0 | 2905 | for (sig . moresigs) on (append sigs nil) for i from 0 |