aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Jasper2014-11-27 19:32:08 +0100
committerUlf Jasper2014-11-27 19:32:08 +0100
commitcceb7a8921e34d4b4942456b59d342a7566fda59 (patch)
treeb7a3d92cacbd017f55d9e352ed675d48eb64b19b
parent07efa3f0ba196c1eea130032c765d5d1a62fa627 (diff)
downloademacs-cceb7a8921e34d4b4942456b59d342a7566fda59.tar.gz
emacs-cceb7a8921e34d4b4942456b59d342a7566fda59.zip
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.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/newst-backend.el14
2 files changed, 14 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d412404efbe..a29cad13cc2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-11-27 Ulf Jasper <ulf.jasper@web.de>
2
3 * net/newst-backend.el (newsticker--parse-atom-1.0): Handle
4 embedded (x)html in summary node.
5
12014-11-27 Sam Steingold <sds@gnu.org> 62014-11-27 Sam Steingold <sds@gnu.org>
2 7
3 * menu-bar.el (menu-bar-open): When everything else fails, 8 * 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 41f8b8440bd..31ebc7ac583 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'"
1216 (car (xml-get-children node 'title))))) 1216 (car (xml-get-children node 'title)))))
1217 ;; desc-fn 1217 ;; desc-fn
1218 (lambda (node) 1218 (lambda (node)
1219 ;; unxml the content node. Atom allows for 1219 ;; unxml the content or the summary node. Atom
1220 ;; integrating (x)html into the atom structure 1220 ;; allows for integrating (x)html into the atom
1221 ;; but we need the raw html string. 1221 ;; structure but we need the raw html string.
1222 ;; e.g. http://www.heise.de/open/news/news-atom.xml 1222 ;; e.g. http://www.heise.de/open/news/news-atom.xml
1223 (or (newsticker--unxml 1223 ;; http://feeds.feedburner.com/ru_nix_blogs
1224 (or (newsticker--unxml
1224 (car (xml-node-children 1225 (car (xml-node-children
1225 (car (xml-get-children node 'content))))) 1226 (car (xml-get-children node 'content)))))
1227 (newsticker--unxml
1228 (car (xml-node-children
1229 (car (xml-get-children node 'summary)))))
1226 (car (xml-node-children 1230 (car (xml-node-children
1227 (car (xml-get-children node 'summary)))))) 1231 (car (xml-get-children node 'summary))))))
1228 ;; link-fn 1232 ;; link-fn