* net/shr.el (shr-tag-img): Prefer the title over the alt text.

Fixes: debbugs:16537

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 193ac3ec71cbc2f6a86e8c4721735a4d8078f32b..4d0f99178f8e159c3c2fbcb5e1af19c47218de19 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-25  Adam Sjøgren  <asjo@koldfront.dk>
+
+       * net/shr.el (shr-tag-img): Prefer the title over the alt text
+       (bug#16537).
+
 2014-01-24  Juanma Barranquero  <lekktu@gmail.com>
 
        * net/eww.el (eww-download-callback):

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 7ef49eaf2d47206df7e980d67045b4ccf15c7011..1491512087d668afb1b86f1f7c6d7d17ace4c21d 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1228,7 +1228,9 @@ The preference is a float determined from `shr-prefer-media-type'."
          (put-text-property start (point) 'image-url url)
          (put-text-property start (point) 'image-displayer
                             (shr-image-displayer shr-content-function))
-         (put-text-property start (point) 'help-echo alt))
+         (put-text-property start (point) 'help-echo
+                            (or (cdr (assq :title cont))
+                                alt)))
        (setq shr-state 'image)))))
 
 (defun shr-tag-pre (cont)