diff options
| author | Jambunathan K <kjambunathan@gmail.com> | 2012-05-24 21:45:28 +0530 |
|---|---|---|
| committer | Jambunathan K <kjambunathan@gmail.com> | 2012-05-24 21:45:28 +0530 |
| commit | d4b3c199f38ac49720994f9a4f79aaf2ea9424f2 (patch) | |
| tree | 3f73a36b332ac066e67a6bdcc5473e339f4ad327 | |
| parent | be8d54509299d14a9584063bd0590e630951e257 (diff) | |
| parent | 1e811161c5006e92dc4df9f1c192be1c206e0a8b (diff) | |
| download | org-mode-d4b3c199f38ac49720994f9a4f79aaf2ea9424f2.tar.gz | |
Merge remote-tracking branch 'origin/maint'
| -rw-r--r-- | lisp/org-lparse.el | 3 | ||||
| -rw-r--r-- | lisp/org-odt.el | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/org-lparse.el b/lisp/org-lparse.el index ef089c6..a792263 100644 --- a/lisp/org-lparse.el +++ b/lisp/org-lparse.el @@ -1111,9 +1111,6 @@ version." (unless body-only (org-lparse-end 'DOCUMENT-CONTENT)) - (unless (plist-get opt-plist :buffer-will-be-killed) - (set-auto-mode t)) - (org-lparse-end 'EXPORT) ;; kill collection buffer diff --git a/lisp/org-odt.el b/lisp/org-odt.el index cec0e8c..7d94319 100644 --- a/lisp/org-odt.el +++ b/lisp/org-odt.el @@ -2231,7 +2231,9 @@ captions on export.") (content-file (expand-file-name "content.xml" outdir))) ;; init conten.xml - (with-current-buffer (find-file-noselect content-file t)) + (with-current-buffer + (let ((nxml-auto-insert-xml-declaration-flag nil)) + (find-file-noselect content-file t))) ;; reset variables (setq org-odt-manifest-file-entries nil @@ -2340,7 +2342,8 @@ visually." (make-directory "META-INF") (let ((manifest-file (expand-file-name "META-INF/manifest.xml"))) (with-current-buffer - (find-file-noselect manifest-file t) + (let ((nxml-auto-insert-xml-declaration-flag nil)) + (find-file-noselect manifest-file t)) (insert "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <manifest:manifest xmlns:manifest=\"urn:oasis:names:tc:opendocument:xmlns:manifest:1.0\" manifest:version=\"1.2\">\n") |