From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= Subject: [PATCH] ox-s5: Update to work with refactored html backedn Date: Thu, 4 May 2017 20:01:44 +0200 Message-ID: <1493920904-19434-1-git-send-email-stlman@poczta.fm> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44042) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6L4G-0007RI-ME for emacs-orgmode@gnu.org; Thu, 04 May 2017 14:01:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6L4D-0004xx-Kp for emacs-orgmode@gnu.org; Thu, 04 May 2017 14:01:32 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.154]:59676) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d6L4D-0004wq-A8 for emacs-orgmode@gnu.org; Thu, 04 May 2017 14:01:29 -0400 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 Cc: =?UTF-8?q?=C5=81ukasz=20Stelmach?= * contrib/lisp/ox-s5.el (org-s5-template): Adapt to changes introduced by c9ca0b6d in the way :html-divs/org-html-divs are passed to ox-html. --- 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