From f97abe62009a2a94bda22e3e941f1bcf9879724c Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 2 Sep 2025 15:10:25 -0400 Subject: [PATCH] (macroexp--obsolete-warning): Prefer `%s` * lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning): `instead` can be a list. * lisp/dom.el (dom-text, dom-texts): Fix obsolescence declaration. --- lisp/dom.el | 4 ++-- lisp/emacs-lisp/macroexp.el | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/dom.el b/lisp/dom.el index d8436abc5fb..e6ccd85c3bd 100644 --- a/lisp/dom.el +++ b/lisp/dom.el @@ -75,12 +75,12 @@ A typical attribute is `href'." (defun dom-text (node) "Return all the text bits in the current node concatenated." - (declare (obsolete 'dom-inner-text "31.1")) + (declare (obsolete dom-inner-text "31.1")) (mapconcat #'identity (cl-remove-if-not #'stringp (dom-children node)) " ")) (defun dom-texts (node &optional separator) "Return all textual data under NODE concatenated with SEPARATOR in-between." - (declare (obsolete 'dom-inner-text "31.1")) + (declare (obsolete dom-inner-text "31.1")) (if (eq (dom-tag node) 'script) "" (mapconcat diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index 1ded58b02f1..2bf9e0eb451 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -212,8 +212,8 @@ It should normally be a symbol with position and it defaults to FORM." (if asof (concat " (as of " asof ")") "") (cond ((stringp instead) (concat "; " (substitute-command-keys instead))) ((and instead key) - (format-message "; use `%s' (%s) instead." instead key)) - (instead (format-message "; use `%s' instead." instead)) + (format-message "; use `%S' (%s) instead." instead key)) + (instead (format-message "; use `%S' instead." instead)) (t "."))))) (defun macroexpand-1 (form &optional environment)