From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?Q?=C5=81ukasz?= Stelmach Subject: [PATCH v1.1] ox-s5: update to work with refactored html backedn Date: Thu, 4 May 2017 17:39:04 +0200 Message-ID: <87r3038tf1.fsf%stlman@poczta.fm> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6b2v-000195-C3 for emacs-orgmode@gnu.org; Fri, 05 May 2017 07:05:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6b2s-0008B3-91 for emacs-orgmode@gnu.org; Fri, 05 May 2017 07:05:13 -0400 Received: from [195.159.176.226] (port=59448 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d6b2s-0008AO-33 for emacs-orgmode@gnu.org; Fri, 05 May 2017 07:05:10 -0400 Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1d6b2k-0004lT-OD for emacs-orgmode@gnu.org; Fri, 05 May 2017 13:05:02 +0200 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 * contrib/lisp/ox-s5.el: adapt to changes introduced by c9ca0b6d in the way :html-divs/org-html-divs are passed to ox-html --- Now it should be ready. contrib/lisp/ox-s5.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/lisp/ox-s5.el b/contrib/lisp/ox-s5.el index 503bfd0..7a717fe 100644 --- a/contrib/lisp/ox-s5.el +++ b/contrib/lisp/ox-s5.el @@ -304,13 +304,13 @@ holding export options." "Return complete document string after HTML conversion. CONTENTS is the transcoded contents string. INFO is a plist holding export options." - (let ((org-html-divs - (if (equal (plist-get info :html-container) "li") - (append '((content "ol" "content")) org-s5--divs) - org-s5--divs)) - (info (plist-put + (let ((info (plist-put + (plist-put (plist-put info :html-preamble (plist-get info :s5-preamble)) - :html-postamble (plist-get info :s5-postamble)))) + :html-postamble (plist-get info :s5-postamble)) + :html-divs (if (equal (plist-get info :html-container) "li") + (append '((content "ol" "content")) org-s5--divs) + org-s5--divs)))) (mapconcat 'identity (list -- 2.1.4