branch: externals/elpa
commit d431d4109918500ff9a99782b45d975709f1d6be
Author: João Távora <joaotav...@gmail.com>
Commit: João Távora <joaotav...@gmail.com>
Fix bug in hover support
* eldoc.el (eglot-eldoc-function): Use eglot--format-markup.
(subr-x): Require it.
(eglot--format-markup): Pacify byte-compiler.
---
eglot.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/eglot.el b/eglot.el
index 8e92725..9d7b16d 100644
--- a/eglot.el
+++ b/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))
