ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 't/patch57'

This commit is contained in:
Carsten Dominik 2010-07-01 15:11:46 +02:00
parent f1924d9224 ea47dd58ff
commit 88429d7270
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lisp/org-feed.el
View File

@ -267,6 +267,17 @@ have been saved."
(defvar org-feed-buffer "*Org feed*"
"The buffer used to retrieve a feed.")
(defun org-feed-unescape (s)
"Unescape protected entities in S."
(let ((re (concat "&\\("
(mapconcat (lambda (e)
(car e)) xml-entity-alist "\\|")
"\\);")))
(while (string-match re s)
(setq s (replace-match
(cdr (assoc (match-string 1 s) xml-entity-alist)) nil nil s)))
s))
;;;###autoload
(defun org-feed-update-all ()
"Get inbox items from all feeds in `org-feed-alist'."
@ -647,10 +658,10 @@ formatted as a string, not the original XML data."
(cond
((string= type "text")
;; We like plain text.
(setq entry (plist-put entry :description (car (xml-node-children content)))))
(setq entry (plist-put entry :description (org-feed-unescape (car (xml-node-children content))))))
((string= type "html")
;; TODO: convert HTML to Org markup.
(setq entry (plist-put entry :description (car (xml-node-children content)))))
(setq entry (plist-put entry :description (org-feed-unescape (car (xml-node-children content))))))
((string= type "xhtml")
;; TODO: convert XHTML to Org markup.
(setq entry (plist-put entry :description (prin1-to-string (xml-node-children content)))))