aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-02-04 16:44:06 +1100
committerLars Ingebrigtsen2016-02-04 16:44:06 +1100
commitaf6ab7efc7a6ce83a289e05792498fa9354e6a32 (patch)
treed39b5e31d60093293d65c98a7eb8e4606d3b49a1
parent3311f4080b5210900e582a2836d30d5ed101f3f0 (diff)
downloademacs-af6ab7efc7a6ce83a289e05792498fa9354e6a32.tar.gz
emacs-af6ab7efc7a6ce83a289e05792498fa9354e6a32.zip
Make shr not bug out on images on non-graphical displays
* lisp/net/shr.el (shr-put-image): Don't bug out on alt-less images on non-graphical displays (bug#22327).
-rw-r--r--lisp/net/shr.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 611f0a90f69..bfda6543b68 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -966,7 +966,7 @@ element is the data blob and the second element is the content-type."
966 (image-animated-p image)))) 966 (image-animated-p image))))
967 (image-animate image nil 60))) 967 (image-animate image nil 60)))
968 image) 968 image)
969 (insert alt))) 969 (insert (or alt ""))))
970 970
971(defun shr-rescale-image (data &optional content-type) 971(defun shr-rescale-image (data &optional content-type)
972 "Rescale DATA, if too big, to fit the current buffer." 972 "Rescale DATA, if too big, to fit the current buffer."