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:16:52 +1100 Message-ID: Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=94eb2c065d9e75fdcc0543827d3d Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGeXN-00083K-5N for emacs-orgmode@gnu.org; Mon, 12 Dec 2016 23:17:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cGeXK-0001Cl-2J for emacs-orgmode@gnu.org; Mon, 12 Dec 2016 23:17:57 -0500 Received: from mail-qk0-f178.google.com ([209.85.220.178]:34496) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cGeXJ-0001Cc-Tp for emacs-orgmode@gnu.org; Mon, 12 Dec 2016 23:17:53 -0500 Received: by mail-qk0-f178.google.com with SMTP id q130so105007617qke.1 for ; Mon, 12 Dec 2016 20:17:53 -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 --94eb2c065d9e75fdcc0543827d3d 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) --94eb2c065d9e75fdcc0543827d3d Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

* contrib/lisp/ox-confluence.el (org-c= onfluence-fixed-width): retrieve
=C2=A0 value of org element &quo= t;fixed-width" instead of using "content", which
= =C2=A0 is empty.
---
=C2=A0contrib/lisp/ox-confluence.e= l | 3 ++-
=C2=A01 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-confluenc= e.el
@@ -89,7 +89,8 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0(org-trim contents))))

=C2=A0(def= un org-confluence-fixed-width (fixed-width contents info)
- =C2= =A0(format "\{\{%s\}\}" contents))
+ =C2=A0(format &quo= t;\{\{%s\}\}"
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 (org-trim (org-e= lement-property :value fixed-width))))

=C2=A0(defu= n org-confluence-verbatim (verbatim contents info)
=C2=A0 =C2=A0(= format "\{\{%s\}\}" (org-element-property :value verbatim)))
--
2.9.3 (Apple Git-75)
--94eb2c065d9e75fdcc0543827d3d--