(shr-tag-object): Don't bug out on text elements in <object>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3ab15aab2433f54da3316d2b3ebc5dcc70ee4ee8..20461a654fea73edbc34f1476dbccb1bd8da9a22 100644 (file)
--- 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 186c9f5757d7fd0ac3d29fc2489115462e43dee3..695b91dcb1bd230275b75ae1d4e16e69aef51a2a 100644 (file)
--- 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))