From 57aaaa9330ce8b535b9a9d13fc59326b725cd58f Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Mon, 25 Mar 2013 22:45:06 +0100
Subject: [PATCH] Revert "Fix previous commit again"

This reverts commit a3e8a1d6048f36057a38fe31c34d5fae98b684bb.
---
 lisp/ox-odt.el | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index 5fb149119..366dbdd42 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -3093,10 +3093,9 @@ holding contextual information."
     (while (search-forward "<office:annotation>" nil t)
       (and (re-search-backward "</text:p>" nil t)
 	   (replace-match "" t t))
-      (search-forward "</office:annotation>" nil t)
-      (if (re-search-forward "<text:p[^>]*>" nil t)
-	  (replace-match "" t t)
-	(insert "\n</text:p>")))))
+      (and (search-forward "</office:annotation>" nil t)
+	   (re-search-forward "<text:p[^>]*>" nil t)
+	   (replace-match "" t t)))))
 
 
 ;;;; Src Block
@@ -4086,7 +4085,7 @@ contextual information."
 		       (with-current-buffer buf
 			 ;; Prettify output if needed.
 			 (if (equal (file-name-nondirectory (buffer-file-name buf))
-				    "content.xml")
+				      "content.xml")
 			     (org-odt--fix-annotations))
 			 (when org-odt-prettify-xml
 			   (indent-region (point-min) (point-max)))
-- 
2.11.4.GIT