[Emacs-diffs] master cceb7a8: newsticker: Handle embedded (x)html in atom feeds.

[Ulf Jasper]

branch: master
commit cceb7a8921e34d4b4942456b59d342a7566fda59
Author: Ulf Jasper <address@hidden>
Date:   Thu Nov 27 19:32:08 2014 +0100

    newsticker: Handle embedded (x)html in atom feeds.
    
    * lisp/net/newst-backend.el (newsticker--parse-atom-1.0): Handle
    embedded (x)html in summary node.
---
 lisp/ChangeLog            |    5 +++++
 lisp/net/newst-backend.el |   14 +++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d412404..a29cad1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-27  Ulf Jasper  <address@hidden>
+
+       * net/newst-backend.el (newsticker--parse-atom-1.0): Handle
+       embedded (x)html in summary node.
+
 2014-11-27  Sam Steingold  <address@hidden>
 
        * menu-bar.el (menu-bar-open): When everything else fails,
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index 41f8b84..31ebc7a 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -1216,13 +1216,17 @@ URL 
`http://www.atompub.org/2005/08/17/draft-ietf-atompub-format-11.html'"
                             (car (xml-get-children node 'title)))))
                     ;; desc-fn
                     (lambda (node)
-                      ;; unxml the content node. Atom allows for
-                      ;; integrating (x)html into the atom structure
-                      ;; but we need the raw html string.
+                      ;; unxml the content or the summary node. Atom
+                      ;; allows for integrating (x)html into the atom
+                      ;; structure but we need the raw html string.
                       ;; e.g. http://www.heise.de/open/news/news-atom.xml
-                  (or (newsticker--unxml
+                      ;; http://feeds.feedburner.com/ru_nix_blogs
+                      (or (newsticker--unxml
                            (car (xml-node-children
-                                (car (xml-get-children node 'content)))))
+                                 (car (xml-get-children node 'content)))))
+                          (newsticker--unxml
+                           (car (xml-node-children
+                                 (car (xml-get-children node 'summary)))))
                           (car (xml-node-children
                                 (car (xml-get-children node 'summary))))))
                     ;; link-fn