From 2038b983a751a2e26c2e8a0b8d55ade29fb394fd Mon Sep 17 00:00:00 2001 From: Thomas Voss Date: Wed, 25 Sep 2024 15:51:36 +0200 Subject: [PATCH] Substitute quotation marks in Eglot messages * lisp/progmodes/eglot.el (eglot--error) (eglot--message): Wrap the message in `substitute-quotes'. * lisp/progmodes/eglot.el (eglot-rename): Format the prompt using `format-prompt' as opposed to `format'. Copyright-paperwork-exempt: yes --- lisp/progmodes/eglot.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index a358b82..ee52767 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -1698,11 +1698,11 @@ eglot--connect ;;; (defun eglot--error (format &rest args) "Error out with FORMAT with ARGS." - (error "[eglot] %s" (apply #'format format args))) + (error "[eglot] %s" (substitute-quotes (apply #'format format args)))) (defun eglot--message (format &rest args) "Message out with FORMAT with ARGS." - (message "[eglot] %s" (apply #'format format args))) + (message "[eglot] %s" (substitute-quotes (apply #'format format args)))) (defun eglot--warn (format &rest args) "Warning message with FORMAT and ARGS." @@ -3704,8 +3704,8 @@ eglot-rename "Rename the current symbol to NEWNAME." (interactive (list (read-from-minibuffer - (format "Rename `%s' to: " (or (thing-at-point 'symbol t) - "unknown symbol")) + (format-prompt "Rename `%s' to" nil (or (thing-at-point 'symbol t) + "unknown symbol")) nil nil nil nil (symbol-name (symbol-at-point))))) (eglot-server-capable-or-lose :renameProvider) -- 2.46.2