summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-05-26 15:22:23 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-05-26 15:22:23 +0200
commit6ac7afba6d93758ec0e6c983860b5b405e7e6c73 (patch)
tree0bfba681d6c766073ddad91f406ebf9d11eb704c
parent0ac099a6f8f58770c583de450a665be755a95b60 (diff)
parentddd58ff99a8684f6bcae24ffa5050857f533e26d (diff)
downloadorg-mode-6ac7afba6d93758ec0e6c983860b5b405e7e6c73.tar.gz
Merge branch 'maint'
-rw-r--r--contrib/lisp/ox-rss.el15
1 files changed, 8 insertions, 7 deletions
diff --git a/contrib/lisp/ox-rss.el b/contrib/lisp/ox-rss.el
index 0c4a2f2..44ee8db 100644
--- a/contrib/lisp/ox-rss.el
+++ b/contrib/lisp/ox-rss.el
@@ -248,12 +248,13 @@ communication channel."
(format-time-string
"%a, %d %b %Y %H:%M:%S %z"
(org-time-string-to-time pubdate0)))))
- (title (or (org-element-property :RSS_TITLE headline)
- (replace-regexp-in-string
- org-bracket-link-regexp
- (lambda (m) (or (match-string 3 m)
- (match-string 1 m)))
- (org-element-property :raw-value headline))))
+ (title (org-rss-plain-text
+ (or (org-element-property :RSS_TITLE headline)
+ (replace-regexp-in-string
+ org-bracket-link-regexp
+ (lambda (m) (or (match-string 3 m)
+ (match-string 1 m)))
+ (org-element-property :raw-value headline))) info))
(publink
(or (and hl-perm (concat (or hl-home hl-pdir) hl-perm))
(concat
@@ -318,7 +319,7 @@ as a communication channel."
(defun org-rss-build-channel-info (info)
"Build the RSS channel information."
(let* ((system-time-locale "C")
- (title (plist-get info :title))
+ (title (org-export-data (plist-get info :title) info))
(email (org-export-data (plist-get info :email) info))
(author (and (plist-get info :with-author)
(let ((auth (plist-get info :author)))