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

[Eli Zaretskii]

branch: emacs-28
commit af67ce64eda8bd694f2df5ccd35ec04f65c9ddc8
Merge: 2ba4ccf 610680a
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emacs into emacs-28
---
 lisp/net/shr.el | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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