From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bastien Guerry <bzg@altern.org>
Subject: [Accepted] [O, Bug] body-only Export Option Adds Extra html Tags.
Date: Wed,  9 Mar 2011 11:29:19 +0100 (CET)
Message-ID: <20110309102919.509496A2D@myhost.localdomain>
References: <87fwqx3csc.fsf@univ-nantes.fr>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=54830 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PxGeC-000655-6m
	for emacs-orgmode@gnu.org; Wed, 09 Mar 2011 05:29:41 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bastienguerry@googlemail.com>) id 1PxGeA-0000bB-MJ
	for emacs-orgmode@gnu.org; Wed, 09 Mar 2011 05:29:40 -0500
Received: from mail-ww0-f49.google.com ([74.125.82.49]:42291)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bastienguerry@googlemail.com>) id 1PxGeA-0000ap-Gc
	for emacs-orgmode@gnu.org; Wed, 09 Mar 2011 05:29:38 -0500
Received: by wwc33 with SMTP id 33so315078wwc.30
	for <emacs-orgmode@gnu.org>; Wed, 09 Mar 2011 02:29:37 -0800 (PST)
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org

Patch 662 (http://patchwork.newartisans.com/patch/662/) is now "Accepted".

Maintainer comment: none

This relates to the following submission:

http://mid.gmane.org/%3C87fwqx3csc.fsf%40univ-nantes.fr%3E

Here is the original message containing the patch:

> Content-Type: text/plain; charset="utf-8"
> MIME-Version: 1.0
> Content-Transfer-Encoding: 7bit
> Subject: [O,Bug] body-only Export Option Adds Extra html Tags.
> Date: Tue, 08 Mar 2011 19:30:27 -0000
> From: Manuel Giraud <manuel.giraud@univ-nantes.fr>
> X-Patchwork-Id: 662
> Message-Id: <87fwqx3csc.fsf@univ-nantes.fr>
> To: lists@manor-farm.org
> Cc: emacs-orgmode@gnu.org
> 
> Manuel Giraud <manuel.giraud@univ-nantes.fr> writes:
> 
> > Ian Barton <lists@manor-farm.org> writes:
> >
> >> So it looks like SHA:
> >>
> >> da8dc7bba72613131f97a28f1c4a912b8d85d7cc Rewrite the handling of HTML
> >> preamble/postamble caused the problem.
> >
> > I'll have a look at that. Is the </div> and </body> with no opening a
> > normal behaviour for the :body-only option ?
> 
> Ok this one was easy. Here's a patch that correct the body-only
> behaviour.
> 
> 
> >From 82f25397a156e34d21339a5499c9a52c1b46f333 Mon Sep 17 00:00:00 2001
> From: Manuel Giraud <manuel.giraud@univ-nantes.fr>
> Date: Tue, 8 Mar 2011 15:22:30 +0100
> Subject: [PATCH 3/3] correct tag closing for body-only
> 
> ---
>  lisp/org-html.el |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/lisp/org-html.el b/lisp/org-html.el
> index 54cbf36..c60c90d 100644
> --- a/lisp/org-html.el
> +++ b/lisp/org-html.el
> @@ -1715,7 +1715,7 @@ lang=\"%s\" xml:lang=\"%s\">
>        (if org-export-html-with-timestamp
>  	  (insert org-export-html-html-helper-timestamp))
>  
> -      (insert "\n</div>\n</body>\n</html>\n")
> +      (unless body-only (insert "\n</div>\n</body>\n</html>\n"))
>  
>        (unless (plist-get opt-plist :buffer-will-be-killed)
>  	(normal-mode)
> -- 
> 1.7.1
> 
>