[Emacs-diffs] trunk r118281: Minor readability parsing issues with SVC images

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 118281
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2014-11-03 23:54:16 +0100
message:
  Minor readability parsing issues with SVC images
  
  * net/eww.el (eww-score-readability): Parse SVC images correctly.
  
  * net/shr.el: Ditto.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1
  lisp/net/shr.el                shr.el-20101002102929-yfzewk55rsg0mn93-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-11-03 22:48:30 +0000
+++ b/lisp/ChangeLog    2014-11-03 22:54:16 +0000
@@ -1,3 +1,9 @@
+2014-11-03  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * net/eww.el (eww-score-readability): Parse SVC images correctly.
+
+       * net/shr.el: Ditto.
+
 2014-11-03  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/edebug.el (edebug-safe-prin1-to-string): Assume that

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2014-11-03 21:27:24 +0000
+++ b/lisp/net/eww.el   2014-11-03 22:54:16 +0000
@@ -459,7 +459,8 @@
      (t
       (dolist (elem (cdr node))
        (cond
-        ((eq (car elem) 'text)
+        ((and (stringp (cdr elem))
+              (eq (car elem) 'text))
          (setq score (+ score (length (split-string (cdr elem))))))
         ((consp (cdr elem))
          (setq score (+ score

=== modified file 'lisp/net/shr.el'
--- a/lisp/net/shr.el   2014-11-03 22:38:26 +0000
+++ b/lisp/net/shr.el   2014-11-03 22:54:16 +0000
@@ -377,7 +377,8 @@
        (sub-nodes nil))
     (dolist (elem (cdr dom))
       (cond
-       ((eq (car elem) 'text)
+       ((and (stringp (cdr elem))
+            (eq (car elem) 'text)
        (push (cdr elem) sub-nodes))
        ((not (listp (cdr elem)))
        (push (cons (intern (substring (symbol-name (car elem)) 1) obarray)