diff options
| author | Bastien <bzg@gnu.org> | 2018-08-05 08:02:14 +0200 |
|---|---|---|
| committer | Bastien <bzg@gnu.org> | 2018-08-05 08:02:14 +0200 |
| commit | 18998fd4c2175358677d7c611317194db21b2e05 (patch) | |
| tree | f27194b75d5458eb448d17b1aa44fe26c5e30168 | |
| parent | f79545f960c37d471f6809d7eab84f86851da49d (diff) | |
| parent | 30498ef932bc35c26e3e58278f4987a67480b446 (diff) | |
| download | org-mode-18998fd4c2175358677d7c611317194db21b2e05.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/ox-odt.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el index a1145a9..74d811d 100644 --- a/lisp/ox-odt.el +++ b/lisp/ox-odt.el @@ -1359,11 +1359,10 @@ original parsed data. INFO is a plist holding export options." ;; Write styles file. (let* ((styles-file (plist-get info :odt-styles-file)) (styles-file (and (org-string-nw-p styles-file) - (read (org-trim styles-file)))) + (org-trim styles-file))) ;; Non-availability of styles.xml is not a critical ;; error. For now, throw an error. (styles-file (or styles-file - (plist-get info :odt-styles-file) (expand-file-name "OrgOdtStyles.xml" org-odt-styles-dir) (error "org-odt: Missing styles file?")))) |