From 5f24dc3771f462ac93efcc7f141b4d1169a8b138 Mon Sep 17 00:00:00 2001
From: Jambunathan K <kjambunathan@gmail.com>
Date: Tue, 26 Apr 2011 12:21:39 +0530
Subject: [PATCH] Fix for stray paragraph breaks in the odt document.

* lisp/org-html.el (org-html-insert-tag-with-newlines): Turn
it off. Fixes stray paragraph breaks in the generated odt
document, under the presence of footnotes..

See http://lists.gnu.org/archive/html/emacs-orgmode/2011-04/msg00755.html.

Thanks to Christian Moe for isolating and reporting this bug.
---
 lisp/org-html.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/org-html.el b/lisp/org-html.el
index e1a22058f..2ac730550 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -2557,7 +2557,10 @@ the alist of previous items."
 ;;;_ , callbacks
 ;;;_  . control callbacks
 ;;;_   , generic
-(defvar org-html-insert-tag-with-newlines 'both)
+(defvar org-html-insert-tag-with-newlines nil) ; un-uglifies exported
+					       ; xml. CAUTION: Not
+					       ; meant for production
+					       ; use.
 
 (defun org-html-insert-tag (tag &rest args)
   (when (member org-html-insert-tag-with-newlines '(lead both))
-- 
2.11.4.GIT