From: João Távora Date: Wed, 13 Jan 2021 15:13:32 +0000 (+0000) Subject: Unbreak interactivee eglot--connect for complex contact specs X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~187 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9622f03b5c679e1d69337c0758507ff3a3928207;p=emacs.git Unbreak interactivee eglot--connect for complex contact specs The previous commit for https://github.com/joaotavora/eglot/issues/526 was completely botched. One has to check current-prefix-arg for the presence of C-u, not eglot--guess-contact INTERACTIVE arg. * eglot.el (eglot--guess-contact): Be more careful when processing guess. GitHub-reference: fix https://github.com/joaotavora/eglot/issues/593 --- diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 5bd087c4354..f843c2dba65 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -725,9 +725,9 @@ be guessed." (guess (if (functionp guess) (funcall guess interactive) guess)) - (class (or (and (not interactive) - (consp guess) (symbolp (car guess)) - (prog1 (car guess) (setq guess (cdr guess)))) + (class (or (and (consp guess) (symbolp (car guess)) + (prog1 (unless current-prefix-arg (car guess)) + (setq guess (cdr guess)))) 'eglot-lsp-server)) (program (and (listp guess) (stringp (car guess))