summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-07-23 18:52:02 +0200
committerBastien Guerry <bzg@altern.org>2013-07-23 18:52:02 +0200
commit2b5670d453f36f3596a2d6ed46ed9c2a0cf88072 (patch)
tree51d20e777cfefbebc1e5599ffc62a3d562094b20
parent555c0520cad9009ddaedfe813e3a8a1eb5ad57f0 (diff)
parent89f2450fe567cf8c1a75f0a48a98b18976025f90 (diff)
downloadorg-mode-2b5670d453f36f3596a2d6ed46ed9c2a0cf88072.tar.gz
Merge branch 'maint'
-rw-r--r--contrib/lisp/ox-rss.el21
1 files changed, 14 insertions, 7 deletions
diff --git a/contrib/lisp/ox-rss.el b/contrib/lisp/ox-rss.el
index 63ee3bc..0e8f640 100644
--- a/contrib/lisp/ox-rss.el
+++ b/contrib/lisp/ox-rss.el
@@ -60,6 +60,10 @@
;; :table-of-contents nil))
;;
;; ... then rsync /home/guerry/public_html/ with your server.
+;;
+;; By default, the permalink for a blog entry points to the headline.
+;; You can specify a different one by using the :RSS_PERMALINK:
+;; property within an entry.
;;; Code:
@@ -237,6 +241,8 @@ communication channel."
(> (org-export-get-relative-level headline info) 1))
(let* ((htmlext (plist-get info :html-extension))
(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))
(anchor
(org-export-solidify-link-text
(or (org-element-property :CUSTOM_ID headline)
@@ -252,13 +258,14 @@ communication channel."
(error "Missing PUBDATE property"))))))
(title (org-element-property :raw-value headline))
(publink
- (concat
- (file-name-as-directory
- (or (plist-get info :html-link-home)
- (plist-get info :publishing-directory)))
- (file-name-nondirectory
- (file-name-sans-extension
- (buffer-file-name))) "." htmlext "#" anchor))
+ (or (concat
+ (or hl-home hl-pdir)
+ (org-element-property :RSS_PERMALINK headline))
+ (concat
+ (or hl-home hl-pdir)
+ (file-name-nondirectory
+ (file-name-sans-extension
+ (buffer-file-name))) "." htmlext "#" anchor)))
(guid (if org-rss-use-entry-url-as-guid
publink
(org-rss-plain-text