mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

(macroexp--obsolete-warning): Prefer %s

Browse source 
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning): `instead`
can be a list.
* lisp/dom.el (dom-text, dom-texts): Fix obsolescence declaration.
This commit is contained in:
Stefan Monnier 2025-09-02 15:10:25 -04:00
parent f1a18e8411
commit f97abe6200
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/dom.el
View file

@ -75,12 +75,12 @@ A typical attribute is `href'."
(defun dom-text (node) (defun dom-text (node)
"Return all the text bits in the current node concatenated." "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)) " ")) (mapconcat #'identity (cl-remove-if-not #'stringp (dom-children node)) " "))
(defun dom-texts (node &optional separator) (defun dom-texts (node &optional separator)
"Return all textual data under NODE concatenated with SEPARATOR in-between." "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) (if (eq (dom-tag node) 'script)
"" ""
(mapconcat (mapconcat

4
lisp/emacs-lisp/macroexp.el
View file

@ -212,8 +212,8 @@ It should normally be a symbol with position and it defaults to FORM."
(if asof (concat " (as of " asof ")") "") (if asof (concat " (as of " asof ")") "")
(cond ((stringp instead) (concat "; " (substitute-command-keys instead))) (cond ((stringp instead) (concat "; " (substitute-command-keys instead)))
((and instead key) ((and instead key)
(format-message "; use `%s' (%s) instead." instead key)) (format-message "; use `%S' (%s) instead." instead key))
(instead (format-message "; use `%s' instead." instead)) (instead (format-message "; use `%S' instead." instead))
(t "."))))) (t ".")))))
(defun macroexpand-1 (form &optional environment) (defun macroexpand-1 (form &optional environment)