summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2014-12-10 05:00:22 +0100
committerLars Magne Ingebrigtsen <larsi@gnus.org>2014-12-10 05:00:32 +0100
commitef8892db3cdf679231cf71613f14589fc3702a80 (patch)
treed002d31b5ab349f964cc9f9245aad32aad9532f6
parentcc857dd0db0fad257747134bdbd8318a21d12cab (diff)
downloademacs-ef8892db3cdf679231cf71613f14589fc3702a80.tar.gz
(shr-tag-object): Don't bug out on text elements in <object>
-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 3ab15aab243..20461a654fe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * net/shr.el (shr-tag-object): Don't bug out on text elements in
+ <object>.
+
2014-12-09 Bozhidar Batsov <bozhidar@batsov.com>
* progmodes/ruby-mode.el (auto-mode-alist): Add .rabl, Berksfile
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 186c9f5757d..695b91dcb1b 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1134,7 +1134,7 @@ ones, in case fg and bg are nil."
(when (string-match "\\`image/svg" type)
(setq url (dom-attr dom 'data)
image t)))
- (dolist (child (dom-children dom))
+ (dolist (child (dom-non-text-children dom))
(cond
((eq (dom-tag child) 'embed)
(setq url (or url (dom-attr child 'src))