mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 19:37:52 +00:00
Merge branch 'maint'
This commit is contained in:
commit
a685acc9e3
|
@ -47,6 +47,7 @@
|
||||||
(italic . org-confluence-italic)
|
(italic . org-confluence-italic)
|
||||||
(item . org-confluence-item)
|
(item . org-confluence-item)
|
||||||
(link . org-confluence-link)
|
(link . org-confluence-link)
|
||||||
|
(paragraph . org-confluence-paragraph)
|
||||||
(property-drawer . org-confluence-property-drawer)
|
(property-drawer . org-confluence-property-drawer)
|
||||||
(section . org-confluence-section)
|
(section . org-confluence-section)
|
||||||
(src-block . org-confluence-src-block)
|
(src-block . org-confluence-src-block)
|
||||||
|
@ -101,6 +102,12 @@
|
||||||
raw-link))
|
raw-link))
|
||||||
"]")))
|
"]")))
|
||||||
|
|
||||||
|
(defun org-confluence-paragraph (paragraph contents info)
|
||||||
|
"Transcode PARAGRAPH element for Confluence.
|
||||||
|
CONTENTS is the paragraph contents. INFO is a plist used as
|
||||||
|
a communication channel."
|
||||||
|
contents)
|
||||||
|
|
||||||
(defun org-confluence-property-drawer (property-drawer contents info)
|
(defun org-confluence-property-drawer (property-drawer contents info)
|
||||||
(and (org-string-nw-p contents)
|
(and (org-string-nw-p contents)
|
||||||
(format "\{\{%s\}\}" contents)))
|
(format "\{\{%s\}\}" contents)))
|
||||||
|
|
Loading…
Reference in a new issue