mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 20:07:46 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
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 "")))) (if (org-string-nw-p contents) contents ""))))
(defun org-confluence-link (link desc info) (defun org-confluence-link (link desc info)
(let ((raw-link (org-element-property :raw-link link))) (if (string= "radio" (org-element-property :type link))
(concat "[" desc
(when (org-string-nw-p desc) (format "%s|" desc)) (let ((raw-link (org-element-property :raw-link link)))
(cond (concat "["
((string-match "^confluence:" raw-link) (when (org-string-nw-p desc) (format "%s|" desc))
(replace-regexp-in-string "^confluence:" "" raw-link)) (cond
(t ((string-match "^confluence:" raw-link)
raw-link)) (replace-regexp-in-string "^confluence:" "" raw-link))
"]"))) (t
raw-link))
"]"))))
(defun org-confluence-paragraph (paragraph contents info) (defun org-confluence-paragraph (paragraph contents info)
"Transcode PARAGRAPH element for Confluence. "Transcode PARAGRAPH element for Confluence.