aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2013-12-07 02:44:15 +0100
committerLars Magne Ingebrigtsen2013-12-07 02:44:15 +0100
commite330b64699b4560bb270d00a89d3c09d91210057 (patch)
treeca4844cb5f468eb07e4fef1084993b16c623cdd0
parent0494d994cde86a36f3a4dbaa7f7a5e8a115fe8a2 (diff)
downloademacs-e330b64699b4560bb270d00a89d3c09d91210057.tar.gz
emacs-e330b64699b4560bb270d00a89d3c09d91210057.zip
* net/shr.el (shr-tag-img): Don't bug out on <img src=""> data.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/shr.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4bad667aa50..5cac769f01b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-12-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * net/shr.el (shr-tag-img): Don't bug out on <img src="">
4 data.
5
12013-12-06 Michael Albinus <michael.albinus@gmx.de> 62013-12-06 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * progmodes/compile.el (compilation-start): 8 * progmodes/compile.el (compilation-start):
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 5857517684a..4c256f8d716 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1173,7 +1173,7 @@ The preference is a float determined from `shr-prefer-media-type'."
1173(defun shr-tag-img (cont &optional url) 1173(defun shr-tag-img (cont &optional url)
1174 (when (or url 1174 (when (or url
1175 (and cont 1175 (and cont
1176 (cdr (assq :src cont)))) 1176 (> (length (cdr (assq :src cont))) 0)))
1177 (when (and (> (current-column) 0) 1177 (when (and (> (current-column) 0)
1178 (not (eq shr-state 'image))) 1178 (not (eq shr-state 'image)))
1179 (insert "\n")) 1179 (insert "\n"))