summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-07-01 15:11:54 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2010-07-01 15:11:54 +0200
commite9927a6d2b50564d990c98fcf8aefe4b3c821312 (patch)
tree56de2e9ff6026ef58f4c603b8c18291171340f5a
parent2505c697969d3d8ab97def89c7e5cc0c8e1ade0c (diff)
parent6875716e76acfbe1084a47e59d18a30a933d92b6 (diff)
downloadorg-mode-e9927a6d2b50564d990c98fcf8aefe4b3c821312.tar.gz
Merge branch 't/patch59'
-rw-r--r--lisp/org-feed.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org-feed.el b/lisp/org-feed.el
index b4b726c..3edcf1a 100644
--- a/lisp/org-feed.el
+++ b/lisp/org-feed.el
@@ -618,7 +618,7 @@ containing the properties `:guid' and `:item-full-text'."
nil t)
(setq entry (plist-put entry
(intern (concat ":" (match-string 1)))
- (match-string 2))))
+ (org-feed-unescape (match-string 2)))))
(goto-char (point-min))
(unless (re-search-forward "isPermaLink[ \t]*=[ \t]*\"false\"" nil t)
(setq entry (plist-put entry :guid-permalink t))))
@@ -651,8 +651,8 @@ formatted as a string, not the original XML data."
'href)))
;; Add <title/> as :title.
(setq entry (plist-put entry :title
- (car (xml-node-children
- (car (xml-get-children xml 'title))))))
+ (org-feed-unescape (car (xml-node-children
+ (car (xml-get-children xml 'title)))))))
(let* ((content (car (xml-get-children xml 'content)))
(type (xml-get-attribute-or-nil content 'type)))
(when content