[Orgmode] [PATCH 3/4] Unescape protected entities defined in `xml-entity-alist'.

[David Maus]

* org-feed.el (org-feed-unescape): New function.  Unescape
  protected entities.
  (org-feed-parse-atom-entry): Use function for atom:content
  type text and html.
---
 lisp/org-feed.el |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lisp/org-feed.el b/lisp/org-feed.el
index b0373e5..2621008 100644
--- a/lisp/org-feed.el
+++ b/lisp/org-feed.el
@@ -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)))))
-- 
1.7.1