OK, please see attached. Stefan Kangas writes: > Brian Leung writes: > >> Tags: patch > > Thanks! > >> From 56f5b196ab2a22f9f77109a2e85367527f0cfc97 Mon Sep 17 >> 00:00:00 2001 >> From: Brian Leung >> Date: Wed, 21 Sep 2022 13:38:53 -0700 >> Subject: [PATCH 1/2] Add nil to eglot-server-programs >> >> * eglot.el (eglot-server-programs): Add nil. > ^^^^^^^^ > > This should be lisp/progmodes/eglot.el. I would also clarify > that "nil" > is the name of a language server here, and not the Lisp symbol. > > (BTW, is the language server named "nil"? Weird.) > >> --- >> eglot.el | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/eglot.el b/eglot.el >> index 901bf30..49592f6 100644 >> --- a/eglot.el >> +++ b/eglot.el >> @@ -218,7 +218,7 @@ >> language-server/bin/php-language-server.php")) >> . ("digestif")) >> (erlang-mode . ("erlang_ls" >> "--transport" "stdio")) >> (yaml-mode >> . ("yaml-language-server" >> "--stdio")) >> - (nix-mode . ("rnix-lsp")) >> + (nix-mode >> . ,(eglot-alternatives '("nil" "rnix-lsp"))) >> (gdscript-mode . ("localhost" >> 6008)) >> ((fortran-mode f90-mode) >> . ("fortls")) >> (futhark-mode . ("futhark" >> "lsp")) >> -- >> 2.37.3 > > Any rationale for why "nil" should be preferred to "rnix-lsp"? > It would > be good to add that to the commit message. > >> From 5a41365bbace7b1e6533ee2664ee601dbeb36306 Mon Sep 17 >> 00:00:00 2001 >> From: Brian Leung >> Date: Sun, 20 Feb 2022 22:21:27 -0800 >> Subject: [PATCH 2/2] Add lua-language-server to >> eglot-server-programs >> >> * eglot.el (eglot-server-programs): Add lua-language-server. It >> is, > ^^^^^^^^ > ^^ > > This should be lisp/progmodes/eglot.el. > > Also, our convention is to use two spaces at the end of > sentences, also > in commit messages. > >> at the time of writing, more actively developed and more >> popular than >> the lua-lsp server, so prioritize that. >> --- >> eglot.el | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/eglot.el b/eglot.el >> index 49592f6..277e04b 100644 >> --- a/eglot.el >> +++ b/eglot.el >> @@ -222,7 +222,8 @@ >> language-server/bin/php-language-server.php")) >> (gdscript-mode . ("localhost" >> 6008)) >> ((fortran-mode f90-mode) >> . ("fortls")) >> (futhark-mode . ("futhark" >> "lsp")) >> - (lua-mode . ("lua-lsp")) >> + (lua-mode >> . ,(eglot-alternatives >> + >> '("lua-language-server" "lua-lsp"))) >> (zig-mode . ("zls")) >> (css-mode >> . ,(eglot-alternatives >> '(("vscode-css-language-server" >> "--stdio") >> ("css-languageserver" >> "--stdio")))) >> (html-mode >> . ,(eglot-alternatives >> '(("vscode-html-language-server" >> "--stdio") >> ("html-languageserver" >> "--stdio")))) >> -- >> 2.37.3