diff options
| author | Eli Zaretskii | 2021-10-31 17:20:52 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2021-10-31 17:20:52 +0200 |
| commit | af67ce64eda8bd694f2df5ccd35ec04f65c9ddc8 (patch) | |
| tree | b68f8f738f0cacb398091b6fb229b121110e78c1 | |
| parent | 2ba4ccf290ed47ebc01a1229b7b90ab2a4991dde (diff) | |
| parent | 610680a8d38f3895e8e39caf60c2d937d9d33d8e (diff) | |
| download | emacs-af67ce64eda8bd694f2df5ccd35ec04f65c9ddc8.tar.gz emacs-af67ce64eda8bd694f2df5ccd35ec04f65c9ddc8.zip | |
Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emacs into emacs-28
| -rw-r--r-- | lisp/net/shr.el | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lisp/net/shr.el b/lisp/net/shr.el index a8e15c1e0ae..f33272fad85 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el | |||
| @@ -1574,15 +1574,14 @@ ones, in case fg and bg are nil." | |||
| 1574 | (shr-urlify (or shr-start start) (shr-expand-url url) title)))) | 1574 | (shr-urlify (or shr-start start) (shr-expand-url url) title)))) |
| 1575 | 1575 | ||
| 1576 | (defun shr-tag-abbr (dom) | 1576 | (defun shr-tag-abbr (dom) |
| 1577 | (when-let* ((title (dom-attr dom 'title)) | 1577 | (let ((title (dom-attr dom 'title)) |
| 1578 | (start (point))) | 1578 | (start (point))) |
| 1579 | (shr-generic dom) | 1579 | (shr-generic dom) |
| 1580 | (shr-add-font start (point) 'shr-abbreviation) | 1580 | (shr-add-font start (point) 'shr-abbreviation) |
| 1581 | (add-text-properties | 1581 | (when title |
| 1582 | start (point) | 1582 | (add-text-properties start (point) |
| 1583 | (list | 1583 | (list 'help-echo title |
| 1584 | 'help-echo title | 1584 | 'mouse-face 'highlight))))) |
| 1585 | 'mouse-face 'highlight)))) | ||
| 1586 | 1585 | ||
| 1587 | (defun shr-tag-acronym (dom) | 1586 | (defun shr-tag-acronym (dom) |
| 1588 | ;; `acronym' is deprecated in favor of `abbr'. | 1587 | ;; `acronym' is deprecated in favor of `abbr'. |