ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien 2020-05-22 16:37:25 +02:00
parent 27ec1c2cff ceb0ef95fb
commit 2e96dc6392
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/lisp/ox-confluence.el
View File

@ -125,15 +125,17 @@
(if (org-string-nw-p contents) contents ""))))
(defun org-confluence-link (link desc info)
(let ((raw-link (org-element-property :raw-link link)))
(concat "["
(when (org-string-nw-p desc) (format "%s|" desc))
(cond
((string-match "^confluence:" raw-link)
(replace-regexp-in-string "^confluence:" "" raw-link))
(t
raw-link))
"]")))
(if (string= "radio" (org-element-property :type link))
desc
(let ((raw-link (org-element-property :raw-link link)))
(concat "["
(when (org-string-nw-p desc) (format "%s|" desc))
(cond
((string-match "^confluence:" raw-link)
(replace-regexp-in-string "^confluence:" "" raw-link))
(t
raw-link))
"]"))))
(defun org-confluence-paragraph (paragraph contents info)
"Transcode PARAGRAPH element for Confluence.