Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emacs into emacs-28

This commit is contained in:
Eli Zaretskii 2021-10-31 17:20:52 +02:00
commit af67ce64ed

View file

@ -1574,15 +1574,14 @@ ones, in case fg and bg are nil."
(shr-urlify (or shr-start start) (shr-expand-url url) title)))) (shr-urlify (or shr-start start) (shr-expand-url url) title))))
(defun shr-tag-abbr (dom) (defun shr-tag-abbr (dom)
(when-let* ((title (dom-attr dom 'title)) (let ((title (dom-attr dom 'title))
(start (point))) (start (point)))
(shr-generic dom) (shr-generic dom)
(shr-add-font start (point) 'shr-abbreviation) (shr-add-font start (point) 'shr-abbreviation)
(add-text-properties (when title
start (point) (add-text-properties start (point)
(list (list 'help-echo title
'help-echo title 'mouse-face 'highlight)))))
'mouse-face 'highlight))))
(defun shr-tag-acronym (dom) (defun shr-tag-acronym (dom)
;; `acronym' is deprecated in favor of `abbr'. ;; `acronym' is deprecated in favor of `abbr'.