emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/eglot ceac05c 05/49: Fix #593: Unbreak interactivee egl


From: Stefan Monnier
Subject: [elpa] externals/eglot ceac05c 05/49: Fix #593: Unbreak interactivee eglot--connect for complex contact specs
Date: Wed, 17 Mar 2021 18:41:42 -0400 (EDT)

branch: externals/eglot
commit ceac05ceaed2afdb5270398d54b85d34a0de6ab7
Author: João Távora <joaotavora@gmail.com>
Commit: João Távora <joaotavora@gmail.com>

    Fix #593: Unbreak interactivee eglot--connect for complex contact specs
    
    The previous commit for #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.
---
 eglot.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eglot.el b/eglot.el
index 5bd087c..f843c2d 100644
--- a/eglot.el
+++ b/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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]