* net/shr.el (shr--extract-best-source): Don't bug out on audio elements

That have text inside.  Also remove debugging.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 53cd24305196c048e66a23b7fbdc7fa2c05f38ae..ea6579209eec38916f2be30eda9b1655d562dbdb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * net/shr.el (shr--extract-best-source): Don't bug out on audio
+       elements with text inside.  Also remove debugging.
+
 2013-12-21  Jan Djärv  <jan.h.d@swipnet.se>
 
        * cus-start.el (all): Add ns-use-srgb-colorspace.

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 4b67bafc5cddf608b2bfe032289d7fabac8bf603..5c30bd8ac6715b9fe8e16969565901dbd01e0ff1 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1136,21 +1136,16 @@ The preference is a float determined from `shr-prefer-media-type'."
   (setq pref (or pref -1.0))
   (let (new-pref)
     (dolist (elem cont)
-      (when (and (listp elem)
-                 (not (keywordp (car elem)))) ;; skip attributes
-        (when (and (eq (car elem) 'source)
-                   (< pref
-                      (setq new-pref
-                            (shr--get-media-pref elem))))
-          (setq pref new-pref
-                url (cdr (assq :src elem)))
-          (message "new %s %s" url pref))
+      (when (and (eq (car elem) 'source)
+                (< pref
+                   (setq new-pref
+                         (shr--get-media-pref elem))))
+       (setq pref new-pref
+             url (cdr (assq :src elem)))
         ;; libxml's html parser isn't HTML5 compliant and non terminated
         ;; source tags might end up as children.  So recursion it is...
         (dolist (child (cdr elem))
-          (when (and (listp child)
-                     (not (keywordp (car child)))  ;; skip attributes
-                     (eq (car child) 'source))
+          (when (eq (car child) 'source)
             (let ((ret (shr--extract-best-source (list child) url pref)))
               (when (< pref (cdr ret))
                 (setq url (car ret)