From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Wed, 10 Dec 2014 04:00:22 +0000 (+0100)
Subject: (shr-tag-object): Don't bug out on text elements in <object>
X-Git-Tag: emacs-25.0.90~2635^2~126
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef8892db3cdf679231cf71613f14589fc3702a80;p=emacs.git

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

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))