From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lungang Fang Subject: [PATCH] ox-confluence.el: Fix error in `org-confluence-fixed-width` Date: Tue, 13 Dec 2016 15:14:08 +1100 Message-ID: Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=f403045f433eacee310543827396 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGeVB-0007Bq-HT for emacs-orgmode@gnu.org; Mon, 12 Dec 2016 23:15:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cGeV4-0000XK-MX for emacs-orgmode@gnu.org; Mon, 12 Dec 2016 23:15:37 -0500 Received: from mail-qt0-f177.google.com ([209.85.216.177]:32863) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cGeV4-0000P1-Hi for emacs-orgmode@gnu.org; Mon, 12 Dec 2016 23:15:34 -0500 Received: by mail-qt0-f177.google.com with SMTP id p16so96289692qta.0 for ; Mon, 12 Dec 2016 20:15:09 -0800 (PST) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: emacs-orgmode@gnu.org --f403045f433eacee310543827396 Content-Type: text/plain; charset=UTF-8 * contrib/lisp/ox-confluence.el (org-confluence-fixed-width): retrieve value of org element "fixed-width" instead of using "content", which is empty. --- contrib/lisp/ox-confluence.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/lisp/ox-confluence.el b/contrib/lisp/ox-confluence.el index de8b00e..98d9ed5 100644 --- a/contrib/lisp/ox-confluence.el +++ b/contrib/lisp/ox-confluence.el @@ -89,7 +89,8 @@ (org-trim contents)))) (defun org-confluence-fixed-width (fixed-width contents info) - (format "\{\{%s\}\}" contents)) + (format "\{\{%s\}\}" + (org-trim (org-element-property :value fixed-width)))) (defun org-confluence-verbatim (verbatim contents info) (format "\{\{%s\}\}" (org-element-property :value verbatim))) -- 2.9.3 (Apple Git-75) --f403045f433eacee310543827396 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
* contrib/lisp/ox-confluence.el (org-confluence-fixed= -width): retrieve
=C2=A0 value of org element "fixed-width&q= uot; instead of using "content", which
=C2=A0 is empty.=
---
=C2=A0contrib/lisp/ox-confluence.el | 3 ++-
<= div>=C2=A01 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/lisp/ox-confluence.el b/contrib/lisp/ox-conflue= nce.el
index de8b00e..98d9ed5 100644
--- a/contrib/lisp= /ox-confluence.el
+++ b/contrib/lisp/ox-confluence.el
@= @ -89,7 +89,8 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= (org-trim contents))))

=C2=A0(defun org-confluence= -fixed-width (fixed-width contents info)
- =C2=A0(format "\{= \{%s\}\}" contents))
+ =C2=A0(format "\{\{%s\}\}"<= /div>
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 (org-trim (org-element-property :va= lue fixed-width))))

=C2=A0(defun org-confluence-ve= rbatim (verbatim contents info)
=C2=A0 =C2=A0(format "\{\{%s= \}\}" (org-element-property :value verbatim)))
--
= 2.9.3 (Apple Git-75)

--f403045f433eacee310543827396--