From: João Távora <joaotavora@gmail.com>
Date: Mon, 4 Apr 2022 09:41:29 +0000 (+0100)
Subject: Guess language-id if manually entering server program
X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~55
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f9cfefcf89cd5d899bd335e9d7674b84cef952f2;p=emacs.git

Guess language-id if manually entering server program

* eglot.el (eglot--guess-contact): Default language-id to educated
guess when eglot--lookup-mode returns nil.

GitHub-reference: fix https://github.com/joaotavora/eglot/issues/837
---

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 6d0b66c2a14..a1c5ab01eb6 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -904,7 +904,8 @@ be guessed."
             (eglot--error "Can't guess mode to manage for `%s'" (current-buffer)))
            (t guessed-mode)))
          (lang-id-and-guess (eglot--lookup-mode guessed-mode))
-         (language-id (car lang-id-and-guess))
+         (language-id (or (car lang-id-and-guess)
+                          (string-remove-suffix "-mode" (symbol-name guessed-mode))))
          (guess (cdr lang-id-and-guess))
          (guess (if (functionp guess)
                     (funcall guess interactive)