mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Revert "Fix previous commit again" 

This reverts commit a3e8a1d604.
This commit is contained in:
Bastien Guerry 2013-03-25 22:45:06 +01:00
parent a6d9fd82ea
commit 57aaaa9330
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/ox-odt.el
View File

@ -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)))