aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Sjøgren2014-01-24 17:52:16 -0700
committerLars Ingebrigtsen2014-01-24 17:52:16 -0700
commit35408b1a6c92b5cf65ee0ff6e61149eee4ba1604 (patch)
tree545a22c91212bcb1461ca0fce8fa8aeb81b97acd
parentc13b1a2dbf9c8a28754ec27d94baaf37d7316732 (diff)
downloademacs-35408b1a6c92b5cf65ee0ff6e61149eee4ba1604.tar.gz
emacs-35408b1a6c92b5cf65ee0ff6e61149eee4ba1604.zip
* net/shr.el (shr-tag-img): Prefer the title over the alt text.
Fixes: debbugs:16537
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/shr.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 193ac3ec71c..4d0f99178f8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-01-25 Adam Sjøgren <asjo@koldfront.dk>
2
3 * net/shr.el (shr-tag-img): Prefer the title over the alt text
4 (bug#16537).
5
12014-01-24 Juanma Barranquero <lekktu@gmail.com> 62014-01-24 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * net/eww.el (eww-download-callback): 8 * net/eww.el (eww-download-callback):
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 7ef49eaf2d4..1491512087d 100644
--- 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'."
1228 (put-text-property start (point) 'image-url url) 1228 (put-text-property start (point) 'image-url url)
1229 (put-text-property start (point) 'image-displayer 1229 (put-text-property start (point) 'image-displayer
1230 (shr-image-displayer shr-content-function)) 1230 (shr-image-displayer shr-content-function))
1231 (put-text-property start (point) 'help-echo alt)) 1231 (put-text-property start (point) 'help-echo
1232 (or (cdr (assq :title cont))
1233 alt)))
1232 (setq shr-state 'image))))) 1234 (setq shr-state 'image)))))
1233 1235
1234(defun shr-tag-pre (cont) 1236(defun shr-tag-pre (cont)