From: João Távora <joaotavora@gmail.com>
Date: Mon, 7 May 2018 21:06:49 +0000 (+0100)
Subject: Fix bug in hover support
X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~621
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=283cfbcd4d53e22ecacdce33bbfe7a2a3b457a3f;p=emacs.git

Fix bug in hover support

* eldoc.el (eglot-eldoc-function): Use eglot--format-markup.
(subr-x): Require it.
(eglot--format-markup): Pacify byte-compiler.
---

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 8e927258be7..9d7b16d39fd 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -34,6 +34,7 @@
 (require 'warnings)
 (require 'flymake)
 (require 'xref)
+(require 'subr-x)
 
 
 ;;; User tweakable stuff
@@ -763,7 +764,7 @@ Meaning only return locally if successful, otherwise exit non-locally."
   "Format MARKUP according to LSP's spec."
   (cond ((stringp markup)
          (with-temp-buffer
-           (ignore-errors (funcall 'markdown-mode))
+           (ignore-errors (funcall (intern "markdown-mode"))) ;escape bytecompiler
            (font-lock-ensure)
            (insert markup)
            (string-trim (buffer-string))))
@@ -1428,7 +1429,7 @@ DUMMY is ignored"
                    :position (eglot--pos-to-lsp-position))
                   :success-fn (eglot--lambda (&key contents _range)
                                 (eldoc-message
-                                 (mapconcat #'eglot--format
+                                 (mapconcat #'eglot--format-markup
                                             (if (vectorp contents)
                                                 contents
                                               (list contents))