summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-07-24 08:28:22 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-07-24 08:28:22 (GMT)
commitf00d759765bfa94adeea53eed23bb642424d04e6 (patch)
treebdd0dbde148724a84eb93211f35f770832c4d86d
parentc815fe55cd06e3506623fce8b016afb1375c7dbd (diff)
parent1ea4c31eea291b157bcaec7ea09517b486126506 (diff)
downloadorg-mode-f00d759765bfa94adeea53eed23bb642424d04e6.zip
org-mode-f00d759765bfa94adeea53eed23bb642424d04e6.tar.gz
Merge branch 'maint'
-rw-r--r--contrib/lisp/ox-rss.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/lisp/ox-rss.el b/contrib/lisp/ox-rss.el
index 0e8f640..d207be6 100644
--- a/contrib/lisp/ox-rss.el
+++ b/contrib/lisp/ox-rss.el
@@ -243,6 +243,7 @@ communication channel."
(hl-number (org-export-get-headline-number headline info))
(hl-home (file-name-as-directory (plist-get info :html-link-home)))
(hl-pdir (plist-get info :publishing-directory))
+ (hl-perm (org-element-property :RSS_PERMALINK headline))
(anchor
(org-export-solidify-link-text
(or (org-element-property :CUSTOM_ID headline)
@@ -258,14 +259,12 @@ communication channel."
(error "Missing PUBDATE property"))))))
(title (org-element-property :raw-value headline))
(publink
- (or (concat
- (or hl-home hl-pdir)
- (org-element-property :RSS_PERMALINK headline))
+ (or (and hl-perm (concat (or hl-home hl-pdir) hl-perm))
(concat
(or hl-home hl-pdir)
(file-name-nondirectory
(file-name-sans-extension
- (buffer-file-name))) "." htmlext "#" anchor)))
+ (plist-get info :input-file))) "." htmlext "#" anchor)))
(guid (if org-rss-use-entry-url-as-guid
publink
(org-rss-plain-text
@@ -334,10 +333,11 @@ as a communication channel."
(blogurl (or (plist-get info :html-link-home)
(plist-get info :publishing-directory)))
(image (url-encode-url (plist-get info :rss-image-url)))
+ (ifile (plist-get info :input-file))
(publink
(concat (file-name-as-directory blogurl)
(file-name-nondirectory
- (file-name-sans-extension (buffer-file-name)))
+ (file-name-sans-extension ifile))
"." rssext)))
(format
"\n<title>%s</title>