summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-03-25 22:45:06 +0100
committerBastien Guerry <bzg@altern.org>2013-03-25 22:45:06 +0100
commit57aaaa9330ce8b535b9a9d13fc59326b725cd58f (patch)
tree36a05fb20355435e2ab53b7a27b40bc9a13ccdab
parenta6d9fd82ea849e17afdecb22e1f5d00e9e8e579a (diff)
downloadorg-mode-57aaaa9330ce8b535b9a9d13fc59326b725cd58f.tar.gz
Revert "Fix previous commit again"
This reverts commit a3e8a1d6048f36057a38fe31c34d5fae98b684bb.
-rw-r--r--lisp/ox-odt.el9
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index 5fb1491..366dbdd 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)))