summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJambunathan K <kjambunathan@gmail.com>2012-05-25 19:04:02 +0530
committerJambunathan K <kjambunathan@gmail.com>2012-05-25 19:04:02 +0530
commit610a00ce2a4e3dc34004a1d3f5adffea031a2017 (patch)
tree90dd4c17f239ff0e890b7b335715160dac47a9af
parent747d71675c9cc7059c1ba7175cdd80a11d478a77 (diff)
parent35b9556cc399e4405a4baa9514f0993b03f318e6 (diff)
downloadorg-mode-610a00ce2a4e3dc34004a1d3f5adffea031a2017.tar.gz
Merge remote-tracking branch 'origin/maint'
-rw-r--r--lisp/org-odt.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org-odt.el b/lisp/org-odt.el
index 7d94319..86902e1 100644
--- a/lisp/org-odt.el
+++ b/lisp/org-odt.el
@@ -2231,9 +2231,9 @@ captions on export.")
(content-file (expand-file-name "content.xml" outdir)))
;; init conten.xml
- (with-current-buffer
- (let ((nxml-auto-insert-xml-declaration-flag nil))
- (find-file-noselect content-file t)))
+ (require 'nxml-mode)
+ (let ((nxml-auto-insert-xml-declaration-flag nil))
+ (find-file-noselect content-file t))
;; reset variables
(setq org-odt-manifest-file-entries nil