[Emacs-diffs] trunk r115666: * net/shr.el (shr--extract-best-source): Don't bug out on audio elements

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 115666
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sat 2013-12-21 18:54:16 +0100
message:
  * net/shr.el (shr--extract-best-source): Don't bug out on audio elements
  
  That have text inside.  Also remove debugging.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/shr.el                shr.el-20101002102929-yfzewk55rsg0mn93-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-21 16:11:55 +0000
+++ b/lisp/ChangeLog    2013-12-21 17:54:16 +0000
@@ -1,3 +1,8 @@
+2013-12-21  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * cus-start.el (all): Add ns-use-srgb-colorspace.

=== modified file 'lisp/net/shr.el'
--- a/lisp/net/shr.el   2013-12-20 04:29:08 +0000
+++ b/lisp/net/shr.el   2013-12-21 17:54:16 +0000
@@ -1136,21 +1136,16 @@
   (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)